diff --git a/.mailmap b/.mailmap index 25bf7876f10..5b382bb6d52 100644 --- a/.mailmap +++ b/.mailmap @@ -63,3 +63,4 @@ howtologinquickwiththirtyninecharacters Érico Rolim Adam Gausmann Adam Gausmann +triallax diff --git a/common/shlibs b/common/shlibs index 6d083594e55..381c6ef8bcc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -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.16 libcpuid-0.6.2_1 +libcpuid.so.17 libcpuid-0.7.0_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,15 +987,20 @@ 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 @@ -1454,7 +1459,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.6 libsnapper-0.10.2_1 +libsnapper.so.7 libsnapper-0.11.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 @@ -2061,7 +2066,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.14 libfm-qt-2.0.2_1 +libfm-qt6.so.15 libfm-qt-2.1.0_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 @@ -2743,7 +2748,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.4 libabigail-2.5_1 +libabigail.so.5 libabigail-2.6_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 @@ -3237,30 +3242,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.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 +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 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 @@ -3321,28 +3326,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.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-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-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 @@ -3579,9 +3584,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.11 glslang-11.11.0_1 -libHLSL.so glslang-11.11.0_1 -libSPIRV.so glslang-11.11.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 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 @@ -3621,8 +3626,6 @@ 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 @@ -4328,7 +4331,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.0_1 +libnvme.so.1 libnvme-1.10_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 @@ -4485,7 +4488,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.3.0 lib2geom-1.3_1 +lib2geom.so.1.4.0 lib2geom-1.4_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 @@ -4538,3 +4541,4 @@ 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 diff --git a/etc/defaults.conf b/etc/defaults.conf index f70e4ea3d00..8cb02c67406 100644 --- a/etc/defaults.conf +++ b/etc/defaults.conf @@ -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 make take a long while in some +# that building with debugging symbols may 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. # diff --git a/srcpkgs/CPU-X/patches/disable_tests.patch b/srcpkgs/CPU-X/patches/disable_tests.patch new file mode 100644 index 00000000000..c8e9c4299a2 --- /dev/null +++ b/srcpkgs/CPU-X/patches/disable_tests.patch @@ -0,0 +1,17 @@ +*** 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 ---- diff --git a/srcpkgs/CPU-X/patches/fix_musl.patch b/srcpkgs/CPU-X/patches/fix_musl.patch new file mode 100644 index 00000000000..a13a183b87a --- /dev/null +++ b/srcpkgs/CPU-X/patches/fix_musl.patch @@ -0,0 +1,11 @@ +*** 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 +--- 22,24 ---- + */ +! #include + #include diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template index 7d1aab355f5..9a5cc8a6163 100644 --- a/srcpkgs/CPU-X/template +++ b/srcpkgs/CPU-X/template @@ -1,30 +1,19 @@ # Template file for 'CPU-X' pkgname=CPU-X -version=4.5.3 -revision=1 +version=5.1.0 +revision=2 archs="x86_64* i686*" build_style=cmake -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" +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" short_desc="Free software that gathers information on CPU, motherboard and more" maintainer="Orphaned " 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=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 +checksum=a99f963dd9cb982966fdfce9e9a9b569f852c1bfffb51e7b9f154abc8c0d40c5 if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" diff --git a/srcpkgs/Carla-bridge-win b/srcpkgs/Carla-bridge-win new file mode 120000 index 00000000000..817012ce210 --- /dev/null +++ b/srcpkgs/Carla-bridge-win @@ -0,0 +1 @@ +Carla \ No newline at end of file diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template old mode 100644 new mode 100755 index 9dee10b94a1..e672a58ceae --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla -version=2.5.1 -revision=4 +version=2.5.8 +revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile pycompile_dirs="usr/share/carla" @@ -16,19 +16,59 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://kx.studio/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" -checksum=c47eea999b2880bde035fbc30d7b42b49234a81327127048a56967ec884dfdba +checksum=4ec96d06342ff28da4b80d4a76bc08fcaa5703726f96e5174afcdc4f7fc6195d 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" @@ -45,6 +85,27 @@ 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 } @@ -57,3 +118,27 @@ 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 + } +} diff --git a/srcpkgs/Clipboard/template b/srcpkgs/Clipboard/template index 3b0c8c6513c..37e869f2f94 100644 --- a/srcpkgs/Clipboard/template +++ b/srcpkgs/Clipboard/template @@ -1,17 +1,17 @@ # Template file for 'Clipboard' pkgname=Clipboard -version=0.9.0.1 +version=0.9.1 revision=1 build_style=cmake hostmakedepends="pkg-config wayland-devel" -makedepends="alsa-lib-devel libX11-devel wayland-devel wayland-protocols" +makedepends="alsa-lib-devel openssl-devel libX11-devel wayland-devel wayland-protocols" short_desc="Cut, copy, and paste anything, anywhere, all from the terminal" maintainer="icp " 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=187eba2a2c72d32d35ff750b947f1c812e33f9af538a6fc1b781e18a5e912d45 +checksum=b59f7111c2de0369d80a379503ac056e33c59be34596d72cda600e4115002b60 post_install() { vcompletion documentation/completions/cb.fish fish cb diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 1c2c3a6e9ec..ee9f36e47dd 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -1,6 +1,6 @@ # Template file for 'GraphicsMagick' pkgname=GraphicsMagick -version=1.3.43 +version=1.3.45 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=2b88580732cd7e409d9e22c6116238bef4ae06fcda11451bf33d259f9cbf399f +checksum=dcea5167414f7c805557de2d7a47a9b3147bcbf617b91f5f0f4afe5e6543026b keep_libtool_archives=yes post_install() { diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index bcb387dd4a9..9b3153a9c02 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -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.1725453128 +version=2.1.1731601260 revision=1 -_commit_hash=87ae18af97fd4de790bb6c476b212e047689cc93 +_commit_hash=fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059 build_style=gnu-makefile hostmakedepends="lua52-BitOp" short_desc="Just-In-Time Compiler for Lua" @@ -11,7 +11,7 @@ maintainer="Daniel Martinez " license="MIT" homepage="https://www.luajit.org" distfiles="https://repo.or.cz/luajit-2.0.git/snapshot/${_commit_hash}.tar.gz" -checksum=c4ab3972a6d00d138caadab27ee53e646342e5d2f52adbffab6a916287b3fe57 +checksum=1f12f67944431d2b54646404fc41f159c2c66c3f69cd6938de1195f17aa702da build_options="lua52compat" desc_option_lua52compat="higher compatibility with lua 5.2" diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template index bd16bb9ea37..1af4f6e4734 100644 --- a/srcpkgs/MoarVM/template +++ b/srcpkgs/MoarVM/template @@ -1,6 +1,6 @@ # Template file for 'MoarVM' pkgname=MoarVM -version=2024.07 +version=2024.10 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=625241fe1578341f6099784f0ea82a62b8a638855c3b8fa604d6ce9e5024fe29 +checksum=055cfeefa3ea081039b75b2a89f6ea063cb3a489643e3dc8db8497a9a02372c9 nocross=yes shlib_provides="libmoar.so" diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 0c6f989f7a8..16a7227914b 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.48.10 +version=1.50.0 revision=1 build_style=meson build_helper="gir qemu" @@ -33,9 +33,9 @@ short_desc="Network Management daemon" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" -changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-48/NEWS" +changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-50/NEWS" distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz" -checksum=5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613 +checksum=fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3 # TODO: Some tests require network namespaces to run. make_check=extended lib32disabled=yes diff --git a/srcpkgs/OpenCL-Headers/template b/srcpkgs/OpenCL-Headers/template index d5a6fdfc464..659d0ccecb4 100644 --- a/srcpkgs/OpenCL-Headers/template +++ b/srcpkgs/OpenCL-Headers/template @@ -1,6 +1,6 @@ # Template file for 'OpenCL-Headers' pkgname=OpenCL-Headers -version=2024.05.08 +version=2024.10.24 revision=1 build_style=cmake short_desc="Khronos OpenCL (Open Computing Language) header files" @@ -8,7 +8,7 @@ maintainer="Andrew J. Hesford " license="Apache-2.0" homepage="https://github.com/KhronosGroup/OpenCL-Headers" distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/v${version}.tar.gz" -checksum=3c3dd236d35f4960028f4f58ce8d963fb63f3d50251d1e9854b76f1caab9a309 +checksum=159f2a550592bae49859fee83d372acd152328fdf95c0dcd8b9409f8fad5db93 provides="opencl-headers-${version}_${revision}" replaces="opencl-headers>=0" diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template index 66866bae3ef..99948dd9138 100644 --- a/srcpkgs/OpenLP/template +++ b/srcpkgs/OpenLP/template @@ -1,6 +1,6 @@ # Template file for 'OpenLP' pkgname=OpenLP -version=3.1.3 +version=3.1.4 revision=1 build_style=python3-module hostmakedepends="python3-setuptools qt5-host-tools" @@ -16,7 +16,7 @@ maintainer="Piotr Wójcik " license="GPL-3.0-or-later" homepage="https://openlp.org/" distfiles="https://gitlab.com/openlp/openlp/-/archive/${version}/openlp-${version}.tar.gz" -checksum=377989f3ffdd225bf285ddb60a88ef4af5903798da58e6c2ec74431246e083c3 +checksum=4091b84307f4ea93d28215b5ef4d8442bf9346938c1e7ba6f377e47267a6094c make_check_pre="env -u QT_QPA_PLATFORM xvfb-run" post_install() { diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index ca7c489138a..e2260fec506 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -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.15 +version=0.4.16 revision=1 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt -_objects_version=1.4.8 +_objects_version=1.4.10 _titles_version=0.4.14 -_replays_version=0.0.80 +_replays_version=0.0.83 _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="f25671e29316fdcd4065e5c029a87e4beb61a3672115c1762ed6b70b5f1ff5a4 - ea78872f9f777fb6b27019e4b880e4cb9766658ee8ae95f76985af0b9658eb4d +checksum="798b2f37577060d62497a0260dcabf446d06fb11deeb255d0478af37b9dc176e + 186a05c91b9a6c328ad0994454033434fe864a8606c1d126485f7469a8e5539c a952148be164c128e4fd3aea96822e5f051edd9a0b1f2c84de7f7628ce3b2e18 f097d3a4ccd39f7546f97db3ecb1b8be73648f53b7a7595b86cccbdc1a7557e4 - de47bc8b19f9b1921177c5e04ab90bd85a2460821020fb6375de3c1795a0af5d + c0b3e33874e43d963b780bcae3eb19ce902364c861e47f1be025248251beb5ed 140df714e806fed411cc49763e7f16b0fcf2a487a57001d1e50fce8f9148a9f3" skip_extraction="objects-${_objects_version}.zip opensound-${_opensfx_version}.zip diff --git a/srcpkgs/PopCorn/files/popcorn/run b/srcpkgs/PopCorn/files/popcorn/run index 4236e0c4bfa..34cdbca8f8a 100644 --- a/srcpkgs/PopCorn/files/popcorn/run +++ b/srcpkgs/PopCorn/files/popcorn/run @@ -6,5 +6,9 @@ : ${PORT:=8001} exec 2>&1 -chpst -u _popcorn:_popcorn popcorn --server $SERVER --port $PORT -exec chpst -u _popcorn:_popcorn snooze popcorn --server $SERVER --port $PORT + +[ ! -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" diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template index 8ddf3183fbb..06b227f9ed2 100644 --- a/srcpkgs/PopCorn/template +++ b/srcpkgs/PopCorn/template @@ -1,7 +1,7 @@ # Template file for 'PopCorn' pkgname=PopCorn version=0.4 -revision=11 +revision=12 build_style=go go_import_path=github.com/the-maldridge/popcorn go_package="${go_import_path}/cmd/popcorn diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template index 4374dacdae8..8d1f0b2094d 100644 --- a/srcpkgs/PrismLauncher/template +++ b/srcpkgs/PrismLauncher/template @@ -1,6 +1,6 @@ # Template file for 'PrismLauncher' pkgname=PrismLauncher -version=9.0 +version=9.1 revision=1 build_style=cmake configure_args="-DLauncher_BUILD_PLATFORM=Void" @@ -12,7 +12,7 @@ maintainer="Philipp David " license="GPL-3.0-only" homepage="https://prismlauncher.org/" distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz" -checksum=8c3dae2469c70d460cd8e2747dc4e61c2e31c15f0754d9e41e23563ac544e2be +checksum=0aac56ec6b039e28f0605e7d86ebf602ee28dd9e4c7a16915ca974104954e832 if [ -z "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTING=0" @@ -26,11 +26,6 @@ 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 } diff --git a/srcpkgs/SFML/template b/srcpkgs/SFML/template index ee094c496cb..bf0c51dacfb 100644 --- a/srcpkgs/SFML/template +++ b/srcpkgs/SFML/template @@ -1,6 +1,6 @@ # Template file for 'SFML' pkgname=SFML -version=2.6.1 +version=2.6.2 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 " license="Zlib" homepage="http://www.sfml-dev.org/" distfiles="https://github.com/SFML/SFML/archive/${version}.tar.gz" -checksum=82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d +checksum=15ff4d608a018f287c6a885db0a2da86ea389e516d2323629e4d4407a7ce047f post_install() { rm -f ${DESTDIR}/usr/sfml-*.pc diff --git a/srcpkgs/SPIRV-LLVM-Translator19-devel b/srcpkgs/SPIRV-LLVM-Translator19-devel new file mode 120000 index 00000000000..05559ceaa12 --- /dev/null +++ b/srcpkgs/SPIRV-LLVM-Translator19-devel @@ -0,0 +1 @@ +SPIRV-LLVM-Translator19 \ No newline at end of file diff --git a/srcpkgs/SPIRV-LLVM-Translator19/template b/srcpkgs/SPIRV-LLVM-Translator19/template new file mode 100644 index 00000000000..449accfe440 --- /dev/null +++ b/srcpkgs/SPIRV-LLVM-Translator19/template @@ -0,0 +1,37 @@ +# 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 " +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" + } +} diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 2df147d3294..c14a13ebe71 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,6 +1,6 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop -version=7.28.0 +version=7.32.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 " 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=2d0d1f6bac0a12555b17ff9f6b97d874774fbe8c5bd28d8da629b2a13c7f9d37 +checksum=e6d51ff1b90bd39090057cdee56476e074e8708e021294cd5ed6b865cb5e3c4a nostrip_files="signal-desktop" post_extract() { diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template index db8e702cd98..c0946443d49 100644 --- a/srcpkgs/SuiteSparse/template +++ b/srcpkgs/SuiteSparse/template @@ -1,6 +1,6 @@ # Template file for 'SuiteSparse' pkgname=SuiteSparse -version=7.8.1 +version=7.8.3 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=b645488ec0d9b02ebdbf27d9ae307f705de2b6133edb64617a72c7b4c6c3ff44 +checksum=ce39b28d4038a09c14f21e02c664401be73c0cb96a9198418d6a98a7db73a259 build_options="openblas" diff --git a/srcpkgs/Swapspace/template b/srcpkgs/Swapspace/template index 25106de9b96..1d171fd953e 100644 --- a/srcpkgs/Swapspace/template +++ b/srcpkgs/Swapspace/template @@ -1,6 +1,6 @@ # Template file for 'Swapspace' pkgname=Swapspace -version=1.18 +version=1.18.1 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=4efbf0815c3e3f85e907a693ab5e74ae99f0041a3bb41358c68c2d4ac370fec2 +checksum=8684861e603b68e261605332ae26bfd54bec4f50bea109c0597ae2e25460e32c conf_files="/etc/swapspace.conf" make_dirs="/var/lib/swapspace 0700 root root" diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 6fd8881afde..32fedbb4cae 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -1,14 +1,17 @@ # Template file for 'Thunar' pkgname=Thunar version=4.18.11 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args="--enable-gio-unix --enable-gudev - --enable-exif --enable-pcre --disable-static --enable-notifications + --enable-exif --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" +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" depends="desktop-file-utils hicolor-icon-theme" short_desc="Thunar File Manager" maintainer="Orphaned " diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template index db480a7469c..5eadef62048 100644 --- a/srcpkgs/aerc/template +++ b/srcpkgs/aerc/template @@ -1,7 +1,7 @@ # Template file for 'aerc' pkgname=aerc -version=0.17.0 -revision=2 +version=0.18.2 +revision=1 build_style=go go_import_path="git.sr.ht/~rjarry/aerc" go_build_tags=notmuch @@ -14,10 +14,14 @@ 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=a8a1af36b4d4989afd670601d83fc2088e14d804c66bd1e3bdd14561bd89c2cc +checksum=78408b3fe7a4991a6097c961c348fb7583af52dff80cbfcd99808415cf3d7586 ignore_elf_dirs="/usr/share/aerc/filters" post_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install vlicense LICENSE } + +do_check() { + make ${makejobs} tests +} diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template index 4a1d15948db..0f4c92f7cb8 100644 --- a/srcpkgs/alacritty/template +++ b/srcpkgs/alacritty/template @@ -1,6 +1,6 @@ # Template file for 'alacritty' pkgname=alacritty -version=0.13.2 +version=0.14.0 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=e9a54aabc92bbdc25ab1659c2e5a1e9b76f27d101342c8219cc98a730fd46d90 +checksum=2919767177c010339502085b4ac5d3f9f15ca27e6befc39aa9d20fefb93ebcdf case "$XBPS_TARGET_MACHINE" in ppc64*) ;; diff --git a/srcpkgs/amberol/template b/srcpkgs/amberol/template index df882c4b75e..dc36f11c644 100644 --- a/srcpkgs/amberol/template +++ b/srcpkgs/amberol/template @@ -1,6 +1,6 @@ # Template file for 'amberol' pkgname=amberol -version=2024.1 +version=2024.2 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=2be110f5a5781fc4d11abf8686335e055866ce6df40562ed5eabab16916faceb +checksum=93b1ef0c2ec5711aa5e170a4a0c81d62f97f6a92c0a74a011955be7022e7e555 post_patch() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template index ee40c08a5b2..90390483d86 100644 --- a/srcpkgs/ansible-core/template +++ b/srcpkgs/ansible-core/template @@ -1,6 +1,6 @@ # Template file for 'ansible-core' pkgname=ansible-core -version=2.17.4 +version=2.17.5 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=44a1f30076796536ba2455cad18d36e62870f04e632e3ca2ebe970d7beacf24d +checksum=ae7f51fd13dc9d57c9bcd43ef23f9c255ca8f18f4b5c0011a4f9b724d92c5a8e conflicts="ansible<2.10.1_1" replaces="ansible-base<2.11.0_1" diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 31e37e64e06..0972275964e 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=10.4.0 +version=10.5.0 revision=1 build_style="python3-pep517" hostmakedepends="python3-setuptools python3-wheel" @@ -10,6 +10,6 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz" -checksum=5c12048831a6690fc865dfe03dc8ab61c3ba08b5d01b249a16b247ad99a60bc0 +checksum=ba2045031a7d60c203b6e5fe1f8eaddd53ae076f7ada910e636494384135face # Relevant tests happen in ansible-core make_check=no diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 8bae6fe9532..47a59740967 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -1,6 +1,6 @@ # Template file for 'apk-tools' pkgname=apk-tools -version=2.14.4 +version=2.14.5 revision=1 build_style=gnu-makefile # Link libapk statically @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " 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=c8ad16bddfae988392ad067a244cfdaf643eb7d6761b73450739585ca76f9a25 +checksum=f61b45fc514b7b1e15817bdbb982a08ea235407f87acbb426529265fc0d02b5c CFLAGS="-Wno-error" post_build() { diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template index 8dbd3ecfd49..ec12aaff75e 100644 --- a/srcpkgs/arduino-cli/template +++ b/srcpkgs/arduino-cli/template @@ -1,7 +1,7 @@ # Template file for 'arduino-cli' pkgname=arduino-cli -version=1.0.4 -revision=2 +version=1.1.0 +revision=1 build_style=go build_helper="qemu" go_import_path=github.com/arduino/arduino-cli @@ -11,7 +11,9 @@ maintainer="Andrew J. Hesford " license="GPL-3.0-or-later" homepage="https://github.com/arduino/arduino-cli" distfiles="https://github.com/arduino/arduino-cli/archive/v${version}.tar.gz" -checksum=9eae425e2629fb8cea2591b87b0a0cb7a8e305bcf3f90c7c121be674d70eca0c +checksum=35681850bed6af2379d1cd40cfda6064ee24e4933eeb1cfc1df47d5b0f8ed70f +# Tests do not find executable in build environment +make_check=no case "$XBPS_TARGET_MACHINE" in # the downloaded toolchains use glibc, this allows them to work on musl diff --git a/srcpkgs/ascii/template b/srcpkgs/ascii/template index f0e1732b52c..92b27006bcf 100644 --- a/srcpkgs/ascii/template +++ b/srcpkgs/ascii/template @@ -1,14 +1,14 @@ # Template file for 'ascii' pkgname=ascii -version=3.20 +version=3.30 revision=1 short_desc="List ASCII idiomatic names and octal/decimal code-point forms" -maintainer="Eloitor " +maintainer="Eloitor " 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=9e6e57ea60d419a803a024ce6366254efb716266b84eedd58cd980dabcc11674 +checksum=ed2fdc973e1b87da2af83050e560e731b0f3bf5f6b4fd9babc9f60bb2b992443 do_build() { make CC="${CC}" CFLAGS="${CFLAGS} ${LDFLAGS}" diff --git a/srcpkgs/ast-grep/template b/srcpkgs/ast-grep/template index 13655b0882e..4e352d88f11 100644 --- a/srcpkgs/ast-grep/template +++ b/srcpkgs/ast-grep/template @@ -1,18 +1,18 @@ # Template file for 'ast-grep' pkgname=ast-grep -version=0.27.3 +version=0.29.0 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 " 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=e93c52271342a235910539b9b821086599564cacb6aa6651b94806a8a65e5003 +checksum=6e6d56b42a4eabf479104d7eee73aeee2743c3e9e1debd860e73127b6fcad09f -post_install() { +do_install() { + vbin target/${RUST_TARGET}/release/ast-grep vlicense LICENSE } diff --git a/srcpkgs/audacious-base/template b/srcpkgs/audacious-base/template index c71032c4ce0..6139e83451c 100644 --- a/srcpkgs/audacious-base/template +++ b/srcpkgs/audacious-base/template @@ -1,7 +1,7 @@ # Template file for 'audacious-base' # Keep in sync with audacious and audacious-plugins pkgname=audacious-base -version=4.4.1 +version=4.4.2 revision=1 build_style=meson configure_args="$(vopt_bool gtk) $(vopt_bool qt) -Dlibarchive=true -Dbuildstamp=xbps" @@ -14,7 +14,7 @@ maintainer="classabbyamp " 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=5198ae8f3a4ba34e63276683227fe831eee79fb926bbe6ff1f3bdd51494e66fc +checksum=030acbf2b58e403d9737f0cda90aa4ce475a7beb0961404c69b6e03ce6a7b008 build_options="gtk qt" build_options_default="qt" diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index ca4e7dd5d8a..0ae0b8d0f3e 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,7 +1,7 @@ # Template file for 'audacious-plugins' # Keep in sync with audacious and audacious-base pkgname=audacious-plugins -version=4.4.1 +version=4.4.2 revision=1 build_style=meson configure_args="$(vopt_bool gtk) $(vopt_bool qt)" @@ -17,7 +17,7 @@ maintainer="classabbyamp " 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=2d7fb3c7753a9224c66633de5c85bfe35fe292897ececfd67cc6d3cb8917b773 +checksum=0825b1e3ac1465c7a012bcb4c629a3390c8c22ebf3d207c6e8db056429e4ffa4 build_options="gtk qt" build_options_default="qt" diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template index 038bb17ee04..7d1a1a8c719 100644 --- a/srcpkgs/audacious/template +++ b/srcpkgs/audacious/template @@ -1,7 +1,7 @@ # Template file for 'audacious' # Keep in sync with audacious-base and audacious-plugins pkgname=audacious -version=4.4.1 +version=4.4.2 revision=1 build_style=meta depends="audacious-base>=${version}_1 audacious-plugins>=${version}_1" diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template index 9c92211ecf1..57e6b68da75 100644 --- a/srcpkgs/axel/template +++ b/srcpkgs/axel/template @@ -1,7 +1,7 @@ # Template file for 'axel' pkgname=axel -version=2.17.11 -revision=2 +version=2.17.14 +revision=1 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=580b2c18692482fd7f1e2b2819159484311ffc50f6d18924dceb80fd41d4ccf9 +checksum=938ee7c8c478bf6fcc82359bbf9576f298033e8b13908e53e3ea9c45c1443693 make_check=no # has no tests post_install() { diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template index 45f9d97bfe0..ee359faeeb3 100644 --- a/srcpkgs/azote/template +++ b/srcpkgs/azote/template @@ -1,6 +1,6 @@ # Template file for 'azote' pkgname=azote -version=1.13.0 +version=1.13.1 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 " -license="BSD-3-Clause, GPL-3.0-or-later" +license="BSD-3-Clause AND 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/v${version}.tar.gz" -checksum=f13fbf3d7051b39e1c6d27dc3a6a46b5ad1f2292e32f431ace1c5b3b3d619ec4 +distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/${version}.tar.gz" +checksum=5902e13463d3ef60e17c81346fee106dcc61e921fa83602d434eab7e67406e08 make_check=no # no tests provided post_install() { diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template index 735696d9e25..be0b87b5502 100644 --- a/srcpkgs/backblaze-b2/template +++ b/srcpkgs/backblaze-b2/template @@ -1,6 +1,6 @@ # Template file for 'backblaze-b2' pkgname=backblaze-b2 -version=4.1.0 +version=4.2.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 " license="MIT" homepage="https://github.com/Backblaze/B2_Command_Line_Tool" distfiles="${PYPI_SITE}/b/b2/b2-${version}.tar.gz" -checksum=d452506b8e2932fc348eec53166b7694b449e2bbc26750dacf74bad4f4ea980a +checksum=b9be2cb1c6e52c1cee948af265619d049bac62e4970de29a3cc01bff625c9539 replaces="python-b2>=0" make_check=no # tests require unpackaged dependencies diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template index 60cea573224..a502c09f64d 100644 --- a/srcpkgs/backintime/template +++ b/srcpkgs/backintime/template @@ -1,6 +1,6 @@ # Template file for 'backintime' pkgname=backintime -version=1.4.3 +version=1.5.3 revision=1 configure_args="--python3" pycompile_dirs="/usr/share/backintime" @@ -11,7 +11,7 @@ maintainer="Alpicoid " 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=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776 +checksum=2adf4f2d3b2c95b43f1bc7184c034bc3fa2387b7b94099018770316d979b1534 python_version=3 do_configure() { @@ -38,7 +38,8 @@ do_install() { backintime-qt_package() { short_desc+=" - Qt GUI" depends="backintime-${version}_${revision} - python3-PyQt5 python3-PyQt5-dbus python3-packaging libnotify xdpyinfo" + python3-pyqt6 python3-pyqt6-dbus python3-packaging xdpyinfo + python3-pyqt6-gui python3-pyqt6-widgets" pkg_install() { vmove "usr/bin/backintime-qt*" vmove usr/share/applications diff --git a/srcpkgs/bc-java/template b/srcpkgs/bc-java/template index 98ac54fcb91..1914dd8fe74 100644 --- a/srcpkgs/bc-java/template +++ b/srcpkgs/bc-java/template @@ -1,6 +1,6 @@ # Template file for 'bc-java' pkgname=bc-java -version=1.78 +version=1.79 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=6eb33f05248aa74a7927435d364c5fbeb3f3885e476f36e1ee36ff58f4db49e4 +checksum=d9da71f958e1779a396407a24e607036a19e5c482d385cadfe0455e21ac35055 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 } diff --git a/srcpkgs/betterlockscreen/patches/use-loginctl.patch b/srcpkgs/betterlockscreen/patches/use-loginctl.patch index fbee7bb3b24..c9a88bb6cf8 100644 --- a/srcpkgs/betterlockscreen/patches/use-loginctl.patch +++ b/srcpkgs/betterlockscreen/patches/use-loginctl.patch @@ -1,10 +1,27 @@ +diff --git a/betterlockscreen b/betterlockscreen +index 0b92ad9..fdd7b60 100755 --- a/betterlockscreen +++ b/betterlockscreen -@@ -968,6 +968,6 @@ echof header "Betterlockscreen" - # Activate lockscreen - [[ $runsuspend ]] || lockargs+=(-n) - [[ $runlock ]] && lockselect "$lockstyle" && \ -- { [[ $runsuspend ]] && systemctl suspend; } -+ { [[ $runsuspend ]] && loginctl suspend; } +@@ -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)" - exit 0 diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template index 2052595c5b4..b9097e73b33 100644 --- a/srcpkgs/betterlockscreen/template +++ b/srcpkgs/betterlockscreen/template @@ -1,6 +1,6 @@ # Template file for 'betterlockscreen' pkgname=betterlockscreen -version=4.0.4 +version=4.4.0 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 " license="MIT" homepage="https://github.com/pavanjadhaw/betterlockscreen" distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${version}.tar.gz" -checksum=608b56989eea0b45c0f88bdc9e3c7742430f809a1bcd60d558eb6af99aeecc91 +checksum=fdcf58725f0ab56e98ce9b83bd1dad6e1f08c7f9f230c3abaf4191f10ebd5dfd do_install() { vbin betterlockscreen diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template index 8298d8af36a..f4e69b04007 100644 --- a/srcpkgs/binwalk/template +++ b/srcpkgs/binwalk/template @@ -1,6 +1,6 @@ # Template file for 'binwalk' pkgname=binwalk -version=2.4.2 +version=2.4.3 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MIT" homepage="https://github.com/OSPG/binwalk" distfiles="https://github.com/OSPG/binwalk/archive/v${version}.tar.gz" -checksum=36b11a4d245bce9663c2c17085282eb1012716c9f0f6754497126b1ad25cd4e7 +checksum=1b48aa2167dda6b434d6c98bdfbf513358ed65ca10d5e5dd90893718cabcdfab post_extract() { vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py diff --git a/srcpkgs/black/template b/srcpkgs/black/template index b74b4764e1a..f88493bbc9a 100644 --- a/srcpkgs/black/template +++ b/srcpkgs/black/template @@ -1,6 +1,6 @@ # Template file for 'black' pkgname=black -version=24.8.0 +version=24.10.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=2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f +checksum=846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875 post_check() { PYTHONPATH=src python3 -m black --check src tests diff --git a/srcpkgs/bleachbit/patches/python-3.12.diff b/srcpkgs/bleachbit/patches/python-3.12.diff deleted file mode 100644 index 7609a603c52..00000000000 --- a/srcpkgs/bleachbit/patches/python-3.12.diff +++ /dev/null @@ -1,13 +0,0 @@ -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" diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template index 2c8dd9d4c73..4830954e3c0 100644 --- a/srcpkgs/bleachbit/template +++ b/srcpkgs/bleachbit/template @@ -1,7 +1,7 @@ # Template file for 'bleachbit' pkgname=bleachbit -version=4.4.2 -revision=2 +version=4.6.2 +revision=1 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 " license="GPL-3.0-or-later" homepage="https://www.bleachbit.org/" distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz" -checksum=6001c864688e36bd8f950c1341923c9347c2373149a9ce98dc26c39023b51997 +checksum=fbdf7c9f7e8aac5c8720a27c6fac934f4ea9e68f1047e772d94414a2a5e51952 python_version=3 diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template index d562c798d6f..bb4115b017b 100644 --- a/srcpkgs/bluefish/template +++ b/srcpkgs/bluefish/template @@ -1,7 +1,7 @@ # Template file for 'bluefish' pkgname=bluefish -version=2.2.12 -revision=5 +version=2.2.16 +revision=1 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 " license="GPL-3.0-only" homepage="https://bluefish.openoffice.nl/" distfiles="https://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2" -checksum=0df9905ba2c601cd767fa53e147969e9c90bc0cc4c005c4011c150b248979e6a +checksum=14e6476fcee8fa326f7f63f1f693d252195f9dcb16af0fe3c915c499baf5dd74 python_version=3 lib32disabled=yes xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --" diff --git a/srcpkgs/bluez/patches/disable-test-vcp.patch b/srcpkgs/bluez/patches/disable-test-vcp.patch new file mode 100644 index 00000000000..ffbdbddea17 --- /dev/null +++ b/srcpkgs/bluez/patches/disable-test-vcp.patch @@ -0,0 +1,24 @@ +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(); + } diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 2f701242ee6..51dfb5cc230 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,6 +1,6 @@ # Template file for 'bluez' pkgname=bluez -version=5.76 +version=5.78 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=55e2c645909ad82d833c42ce85ec20434e0ef0070941b1eab73facdd240bbd63 +checksum=830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3 conf_files="/etc/bluetooth/main.conf" system_groups="bluetooth" @@ -44,6 +44,8 @@ post_install() { vsv bluetoothd vdoc ${FILESDIR}/README.voidlinux + + rm ${DESTDIR}/etc/bluetooth/mesh-main.conf } libbluetooth_package() { diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template index 7a6a5c13c52..75e9eb12390 100644 --- a/srcpkgs/borgmatic/template +++ b/srcpkgs/borgmatic/template @@ -1,6 +1,6 @@ # Template file for 'borgmatic' pkgname=borgmatic -version=1.8.14 +version=1.9.1 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=598b3bc22c19d53bd375e5295afec56d111759f74671845aacfe055c539fa746 +checksum=d2f0bae2c2050040e5e07a825e605f195cbe9974862b290238c48f72fc04e79a diff --git a/srcpkgs/bovo/template b/srcpkgs/bovo/template index c81c2aa7d64..b02fdae18c5 100644 --- a/srcpkgs/bovo/template +++ b/srcpkgs/bovo/template @@ -1,6 +1,6 @@ # Template file for 'bovo' pkgname=bovo -version=24.08.2 +version=24.08.3 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=91b024ef4bfdb97c70637236870492d4ac425d48c81f5b886a765ec446c7c7ab +checksum=e31ebe29cd4d4560a771ff2d6fa3687d72207b5050bf8020cdbb2bab46c6ece7 diff --git a/srcpkgs/bpfmon/template b/srcpkgs/bpfmon/template index c1ba5831b03..d101ece6d32 100644 --- a/srcpkgs/bpfmon/template +++ b/srcpkgs/bpfmon/template @@ -1,6 +1,6 @@ # Template file for 'bpfmon' pkgname=bpfmon -version=2.52 +version=2.53 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=e4e882c6d998b8adb04e1372d4f7a3342fede472770ab3aa9bf6ebd5b848c5e7 +checksum=f73508a40b093caea8ac20431c19b1e89627311bbd8ff49063ec987378a46a7c post_extract() { vsed -e 's;$(PREFIX)/sbin;$(PREFIX)/bin;g' -i Makefile diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template index 329df803067..58e78493090 100644 --- a/srcpkgs/breeze-icons/template +++ b/srcpkgs/breeze-icons/template @@ -1,6 +1,6 @@ # Template file for 'breeze-icons' pkgname=breeze-icons -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake build_helper=qemu @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-3.0-or-later" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2d8ccc427ec864b6417eabe3aafe9b1f6857bf2a4fdcd0dc5c006413148e66d9 +checksum=39037e3fcbbb7a65011685c498cae31ff496a5f2493269c955bb29c94a688b74 nostrip=yes if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template index 74a774664d7..d9bad60d039 100644 --- a/srcpkgs/broot/template +++ b/srcpkgs/broot/template @@ -1,6 +1,6 @@ # Template file for 'broot' pkgname=broot -version=1.43.0 +version=1.44.2 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=64e1b4e2c57373b85ef358241655739f5bb8dedd6600ce0347a6b40640614326 +checksum=e1b78354c21680914a07ed4b856257c83ef873b878ef281bd2d1aed7fcba3828 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="exr crate errors on big endian" diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template index b49563adb13..fcd3a41cc67 100644 --- a/srcpkgs/bubblewrap/template +++ b/srcpkgs/bubblewrap/template @@ -1,6 +1,6 @@ # Template file for 'bubblewrap' pkgname=bubblewrap -version=0.10.0 +version=0.11.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=65d92cf44a63a51e1b7771f70c05013dce5bd6b0b2841c4b4be54b0c45565471 +checksum=988fd6b232dafa04b8b8198723efeaccdb3c6aa9c1c7936219d5791a8b7a8646 diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template index c32d10da482..49203917aea 100644 --- a/srcpkgs/bup/template +++ b/srcpkgs/bup/template @@ -1,17 +1,18 @@ # Template file for 'bup' pkgname=bup -version=0.33 -revision=2 +version=0.33.4 +revision=1 build_style=configure -hostmakedepends="python3 perl git pandoc" -makedepends="python3-devel" -checkdepends="python3-pytest tar rsync" +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" short_desc="Backup system based on the git packfile format" maintainer="Enno Boland " license="LGPL-2.0-only" homepage="https://github.com/bup/bup" distfiles="https://github.com/bup/bup/archive/${version}.tar.gz" -checksum=2c21b25ab0ab845e1490cf20781bdb46e93b9c06f0c6df4ace760afc07a63fe9 +checksum=f51284f2cb24aa653288f05aad32d6ec6ebb9546143ed7c588d40ba82f24b79a python_version=3 nocross=yes diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template index 76e347353ec..eb04dc677e8 100644 --- a/srcpkgs/c-ares/template +++ b/srcpkgs/c-ares/template @@ -1,6 +1,6 @@ # Template file for 'c-ares' pkgname=c-ares -version=1.34.2 +version=1.34.3 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=35410aa625cc9ee95b66475f54aea7c81c673fb63d75fad5eee267711503b72a +checksum=26e1f7771da23e42a18fdf1e58912a396629e53a2ac71b130af93bbcfb90adbe make_check=ci-skip # segfaults only on CI post_install() { diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template index 91b9c67f9eb..68667e8d4fb 100644 --- a/srcpkgs/cage/template +++ b/srcpkgs/cage/template @@ -1,22 +1,18 @@ # Template file for 'cage' pkgname=cage -version=0.1.5 +version=0.2.0 revision=1 build_style=meson -configure_args="$(vopt_bool xwayland xwayland)" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots0.16-devel" -depends="$(vopt_if xwayland xorg-server-xwayland)" +makedepends="wlroots0.18-devel" +depends="xorg-server-xwayland" short_desc="Kiosk compositor for Wayland" maintainer="Orphaned " 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=576b8b5a041712b8d8785243ac6db08c7bc9c32822f96ad6dec7ac2b2db9b2b5 - -build_options="xwayland" -build_options_default="xwayland" -desc_option_xwayland="Enable Xwayland support in cage" +checksum=9d3f659e0f19636a958f9e1bf4d22268d7e2705d7e2989888401ec443c1cb6c3 post_install() { vlicense LICENSE diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index e5b56112ea0..13d40a2bda6 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,6 +1,6 @@ # Template file for 'calibre' pkgname=calibre -version=7.16.0 +version=7.20.0 revision=1 build_helper=python3 pycompile_dirs="/usr/lib/calibre/" @@ -16,7 +16,8 @@ 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" + qt6-base-private-devel python3-pyqt6-bindings python3-pyqt6-webengine-devel + ffmpeg6-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 @@ -28,7 +29,8 @@ 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-pdf python3-pyqt6-webengine python3-fonttools + python3-pyqt6-speech python3-pyqt6-multimedia" checkdepends="${depends} libjpeg-turbo-tools jxrlib" short_desc="Ebook management application" maintainer="skmpz " @@ -36,7 +38,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=11641f6a84f03bd05d65080942bc5f8fa6fcb66b6e92f956e61168fd44a33615 +checksum=06124426c40a93f909c72726ff599bb65ad269e1503ef586181f4350c89d8082 python_version=3 lib32disabled=yes nocross="python3 setup.py gui" @@ -181,11 +183,15 @@ 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_dom_load \ + --exclude-test-name test_recipe_browser_webengine \ + --exclude-test-name test_piper } do_install() { diff --git a/srcpkgs/cantata/patches/migrate.patch b/srcpkgs/cantata/patches/migrate.patch new file mode 100644 index 00000000000..f1fc03d50af --- /dev/null +++ b/srcpkgs/cantata/patches/migrate.patch @@ -0,0 +1,757 @@ +From 740089b05a6dcb95ee442a2e370c2b795a518d97 Mon Sep 17 00:00:00 2001 +From: Citlali del Rey +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 @@ + + 0 + 0 +- 668 +- 607 ++ 1007 ++ 855 + + + +@@ -38,7 +38,6 @@ + + + +- 75 + true + + +@@ -50,10 +49,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -69,20 +68,20 @@ + <p>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.</p><p>For more information on MPD itself, please refer to the MPD website <a href="http://www.musicpd.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.musicpd.org</span></a></p><p>This 'wizard' will guide you through the basic settings required for Cantata to function correctly.</p> + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true + + +- Qt::NoTextInteraction ++ Qt::TextInteractionFlag::NoTextInteraction + + + + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + + +@@ -100,7 +99,6 @@ + + + +- 75 + true + + +@@ -108,17 +106,17 @@ + <p>Welcome to Cantata</p> + + +- Qt::NoTextInteraction ++ Qt::TextInteractionFlag::NoTextInteraction + + + + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -134,13 +132,13 @@ + <p>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.<br/><br/>Please select how you would like to have Cantata initially connect to (or startup) MPD:</p> + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true + + +- Qt::NoTextInteraction ++ Qt::TextInteractionFlag::NoTextInteraction + + + +@@ -172,7 +170,7 @@ + <i>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.</i> + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true +@@ -185,10 +183,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -217,7 +215,7 @@ + <i>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 <b>not</b> be accessible to other MPD clients (e.g. MPDroid)</i> + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true +@@ -233,17 +231,17 @@ + + + +- If you wish to have an advanced MPD setup (e.g. multiple audio outputs, full DSD support, etc) then you <b>must</b> choose 'Standard' ++ If you wish to have an advanced MPD setup (e.g. multiple audio outputs, full DSD support, etc) then you <b>must</b> choose 'Standard' + + + + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -259,20 +257,20 @@ + For more information on MPD itself, please refer to the MPD website <a href="http://www.musicpd.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.musicpd.org</span></a><br/><br/>This 'wizard' will guide you through the basic settings required for Cantata to function correctly. + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true + + +- Qt::NoTextInteraction ++ Qt::TextInteractionFlag::NoTextInteraction + + + + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + + +@@ -286,6 +284,45 @@ + + + ++ ++ ++ ++ ++ ++ ++ 0 ++ 0 ++ ++ ++ ++ Migrate data from older versions of Cantata ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ 0 ++ ++ ++ ++ true ++ ++ ++ <i>Data from Cantata v2 has been detected on your computer. Leave this box checked to copy the old data and preserve your preferences.</i> ++ ++ ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop ++ ++ ++ true ++ ++ ++ ++ ++ + + + +@@ -313,7 +350,6 @@ + + + +- 75 + true + + +@@ -325,10 +361,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -344,7 +380,7 @@ + The settings below are the basic settings required by Cantata. Please enter the relevant details, and use the 'Connect' button to test the connection. + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true +@@ -354,10 +390,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -370,7 +406,7 @@ + + + +- QFormLayout::ExpandingFieldsGrow ++ QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow + + + +@@ -384,9 +420,6 @@ + + + +- +- 0 +- + + + +@@ -418,7 +451,7 @@ + + + +- QLineEdit::Password ++ QLineEdit::EchoMode::Password + + + +@@ -441,7 +474,6 @@ + + + +- 75 + true + true + +@@ -450,7 +482,7 @@ + + + +- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter ++ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + +@@ -459,7 +491,7 @@ + + + +- Qt::Horizontal ++ Qt::Orientation::Horizontal + + + +@@ -488,7 +520,7 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + + +@@ -506,7 +538,6 @@ + + + +- 75 + true + + +@@ -518,10 +549,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -537,7 +568,7 @@ + Please choose the folder containing your music collection. + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true +@@ -547,10 +578,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -580,7 +611,6 @@ + + + +- 75 + true + true + +@@ -593,7 +623,7 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + + +@@ -615,7 +645,6 @@ + + + +- 75 + true + + +@@ -627,10 +656,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -646,23 +675,23 @@ + <p>Cantata can download missing covers, and store these either in the music folder or within your personal cache folder.</p> + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true + + +- Qt::NoTextInteraction ++ Qt::TextInteractionFlag::NoTextInteraction + + + + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -696,7 +725,7 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + + +@@ -714,7 +743,6 @@ + + + +- 75 + true + + +@@ -726,10 +754,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -745,23 +773,23 @@ + Cantata is now configured!<br/><br/>Cantata's configuration dialog maybe used to customise Cantata's appearance, as well as to add extra MPD hosts, etc. + + +- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop ++ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true + + +- Qt::NoTextInteraction ++ Qt::TextInteractionFlag::NoTextInteraction + + + + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -781,10 +809,10 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + +- QSizePolicy::Fixed ++ QSizePolicy::Policy::Fixed + + + +@@ -797,7 +825,7 @@ + + + +- Qt::Vertical ++ Qt::Orientation::Vertical + + + + +From fcba26faceb401f63cabe5469276f3f8e067f211 Mon Sep 17 00:00:00 2001 +From: Citlali del Rey +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 +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 ++#include + #include + #include + #include ++#include + + 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 +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()) { diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template index 54e82fbb85d..b5b0b001ea6 100644 --- a/srcpkgs/cantata/template +++ b/srcpkgs/cantata/template @@ -1,20 +1,23 @@ # Template file for 'cantata' pkgname=cantata -version=2.5.0 -revision=2 +version=3.2.1 +revision=1 build_style=cmake -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" +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" short_desc="Qt client for the music player daemon (MPD)" -maintainer="LockeAnarchist " +maintainer="Orphaned " license="GPL-3.0-or-later" -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 +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 diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template index 5b9e7d02c52..053483eabde 100644 --- a/srcpkgs/cargo-auditable-bootstrap/template +++ b/srcpkgs/cargo-auditable-bootstrap/template @@ -1,7 +1,7 @@ # Template file for 'cargo-auditable-bootstrap' # Keep synced with cargo-auditable pkgname=cargo-auditable-bootstrap -version=0.6.4 +version=0.6.5 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=3e3f4134d81b47277d34c44bc1169c9b0356612977651f8e98e2ba1a470b69a2 +checksum=5e7dad2d00cba7f09f92f457999d15b7fb786a5ddd1adf87ddbc634878ab5589 repository=bootstrap post_install() { diff --git a/srcpkgs/cargo-auditable/template b/srcpkgs/cargo-auditable/template index fd19a23f850..b28f0b3c92b 100644 --- a/srcpkgs/cargo-auditable/template +++ b/srcpkgs/cargo-auditable/template @@ -1,7 +1,7 @@ # Template file for 'cargo-auditable' # Keep synced with cargo-auditable-bootstrap pkgname=cargo-auditable -version=0.6.4 +version=0.6.5 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=3e3f4134d81b47277d34c44bc1169c9b0356612977651f8e98e2ba1a470b69a2 +checksum=5e7dad2d00cba7f09f92f457999d15b7fb786a5ddd1adf87ddbc634878ab5589 conflicts=cargo-auditable-bootstrap post_install() { diff --git a/srcpkgs/cargo-update/files/Cargo.lock b/srcpkgs/cargo-update/files/Cargo.lock new file mode 100644 index 00000000000..138562bb0d9 --- /dev/null +++ b/srcpkgs/cargo-update/files/Cargo.lock @@ -0,0 +1,879 @@ +# 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", +] diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template index 39530ef89e2..a5ac4608928 100644 --- a/srcpkgs/cargo-update/template +++ b/srcpkgs/cargo-update/template @@ -1,6 +1,6 @@ # Template file for 'cargo-update' pkgname=cargo-update -version=15.0.0 +version=16.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=b932b71e056a091e5fe9459f907f6c7177c9c11ce57fb06b51215a620e710dd2 +checksum=50ab6c2f4c66057cdb337fe1bbb5df5b018acca88b059db0db58aa1664b44285 -post_patch() { +post_extract() { # Upstream does not ship a lockfile and is very vocal about that being # the right way: # https://github.com/nabijaczleweli/cargo-update/issues/50 - cargo generate-lockfile + cp ${FILESDIR}/Cargo.lock . } post_install() { diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template index e3d51dcc5c4..5c2157fea6c 100644 --- a/srcpkgs/chez-scheme/template +++ b/srcpkgs/chez-scheme/template @@ -1,6 +1,6 @@ # Template file for 'chez-scheme' pkgname=chez-scheme -version=10.0.0 +version=10.1.0 revision=1 build_style=gnu-makefile make_build_target="kernel" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://scheme.com/" distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz" -checksum=d37199012b5ed1985c4069d6a87ff18e5e1f5a2df27e402991faf45dc4f2232c +checksum=9181a6c8c4ab5e5d32d879ff159d335a50d4f8b388611ae22a263e932c35398b alternatives=" scheme:scheme:/usr/bin/chez-scheme scheme:scheme.1:/usr/share/man/man1/chez-scheme.1 diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index c18e54a3f87..b78ce75cba5 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.52.3 +version=2.54.0 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=a3986d25ad831de00d5a0937062a413af72aaa2c15d515abd02cf82d79d813c9 +checksum=74281a5b1d9b4e8b5d6f4775204d5b56500649b5d906944a29f6c284aa54423e pre_build() { local _date diff --git a/srcpkgs/chirp/template b/srcpkgs/chirp/template index 09ccf942bb0..b5673298dac 100644 --- a/srcpkgs/chirp/template +++ b/srcpkgs/chirp/template @@ -1,6 +1,6 @@ # Template file for 'chirp' pkgname=chirp -version=20240807 +version=20241025 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -11,4 +11,4 @@ maintainer="Emil Miler " 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=19d8f0a7583ee7517cf46d2b40836037d6c1be77a25a71425e47ca4366cec58c +checksum=3e1812264a06a95833ed32a8c0ac83a7f93b8d94e58484390b8892fcdeae6024 diff --git a/srcpkgs/chromium/files/chromium.sh b/srcpkgs/chromium/files/chromium.sh index 9d5e8e11a37..46bf84c1b65 100644 --- a/srcpkgs/chromium/files/chromium.sh +++ b/srcpkgs/chromium/files/chromium.sh @@ -2,7 +2,4 @@ export CHROME_WRAPPER=/usr/lib/chromium/chromium export CHROME_DESKTOP=chromium.desktop CHROME_FLAGS="--enable-gpu-rasterization $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 +exec /usr/lib/chromium/chromium $CHROME_FLAGS "$@" diff --git a/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch b/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch index 22d865aa42f..f318e21a104 100644 --- a/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch +++ b/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch @@ -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; diff --git a/srcpkgs/chromium/patches/build-support-musl.patch b/srcpkgs/chromium/patches/build-support-musl.patch index 1e5b0b8afae..635c592b0a3 100644 --- a/srcpkgs/chromium/patches/build-support-musl.patch +++ b/srcpkgs/chromium/patches/build-support-musl.patch @@ -13,66 +13,23 @@ shlib_extension = ".dylib" --- a/build/config/rust.gni +++ b/build/config/rust.gni -@@ -185,11 +185,23 @@ +@@ -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. rust_abi_target = "" - if (is_linux || is_chromeos) { +-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 (current_cpu == "arm64") { -- 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") + rust_abi_target = "aarch64-unknown-linux-gnu" + cargo_target_abi = "" diff --git a/srcpkgs/chromium/patches/chromium-125-iwyu-webauthn-variant.patch b/srcpkgs/chromium/patches/chromium-125-iwyu-webauthn-variant.patch deleted file mode 100644 index 52448e49f0d..00000000000 --- a/srcpkgs/chromium/patches/chromium-125-iwyu-webauthn-variant.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/chrome/browser/webauthn/authenticator_request_dialog_model.h -+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - - #include "base/containers/span.h" diff --git a/srcpkgs/chromium/patches/chromium-128-perfetto-musl-prctl_mm_map.patch b/srcpkgs/chromium/patches/chromium-128-perfetto-musl-prctl_mm_map.patch deleted file mode 100644 index 5b58548b655..00000000000 --- a/srcpkgs/chromium/patches/chromium-128-perfetto-musl-prctl_mm_map.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3c48d6b9fc82dccbb0bfb905cf808f73a7a02e71 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" -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 - #include - - #ifndef PR_GET_TAGGED_ADDR_CTRL diff --git a/srcpkgs/chromium/patches/chromium-130-hardware_destructive_interference_size.patch b/srcpkgs/chromium/patches/chromium-130-hardware_destructive_interference_size.patch new file mode 100644 index 00000000000..8d02fd9b5e3 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-130-hardware_destructive_interference_size.patch @@ -0,0 +1,21 @@ +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 + #include +-#include + #include + #include + #include +@@ -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 data_; + bool is_sorted_; diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 3003c9c632f..87175825ab6 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,13 +1,14 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=129.0.6668.58 +version=131.0.6778.69 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" + libepoxy-devel libevent-devel libglib-devel rust rust-bindgen + gn" makedepends=" alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel fontconfig-devel freetype-devel gtk+3-devel libXScrnSaver-devel @@ -27,8 +28,10 @@ short_desc="Google's attempt at creating a safer, faster, and more stable browse maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" -distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=eaf850183d32627ce0cde9f3d3f853bc11c217ef7f41540303214ed47803d96d +# 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" lib32disabled=yes @@ -49,10 +52,6 @@ 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 @@ -143,10 +142,12 @@ _setup_toolchain() { do_configure() { local system=() conf=() - # 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 + 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 # Use system-provided libraries. # TODO: use_system_hunspell (upstream changes needed). @@ -303,7 +304,11 @@ do_configure() { esac fi _setup_toolchain - out/Release/gn gen out/Release --args="${conf[*]}" + if false; then + out/Release/gn gen out/Release --args="${conf[*]}" + else + gn gen out/Release --args="${conf[*]}" + fi } do_build() { diff --git a/srcpkgs/chrony_exporter/template b/srcpkgs/chrony_exporter/template index 1af78881c54..64d0ff304fb 100644 --- a/srcpkgs/chrony_exporter/template +++ b/srcpkgs/chrony_exporter/template @@ -1,9 +1,11 @@ # Template file for 'chrony_exporter' pkgname=chrony_exporter -version=0.10.1 -revision=2 +version=0.11.0 +revision=1 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 " @@ -11,7 +13,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=93aa56b0fa2b2616b7b3723aa80a3e9e1acf684fe71e55931ef7ce6ca6c28490 +checksum=3323bde89a4e8cb356956e8fdcb02d2854614ebb87e67a5563427c577090b5d2 post_install() { vsv chrony_exporter diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template index 51edcf7c5b8..6c96b2e1c6e 100644 --- a/srcpkgs/chroot-util-linux/template +++ b/srcpkgs/chroot-util-linux/template @@ -1,6 +1,6 @@ # Template file for 'chroot-util-linux' pkgname=chroot-util-linux -version=2.40.1 +version=2.40.2 revision=1 bootstrap=yes build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Enno Boland " 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=59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f +checksum=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 conflicts="util-linux>=0" provides="util-linux-${version}_${revision}" repository=bootstrap diff --git a/srcpkgs/citations/template b/srcpkgs/citations/template index fe7dd863eb3..4d381786bb3 100644 --- a/srcpkgs/citations/template +++ b/srcpkgs/citations/template @@ -1,6 +1,6 @@ # Template file for 'citations' pkgname=citations -version=0.6.4 +version=0.7.0 revision=1 build_style=meson build_helper=rust @@ -13,7 +13,7 @@ maintainer="Alex Childs " 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=89626bdb78aa466926ba9be6b57bd24514bb6e0d2b9492f3c9f0705464371cb5 +checksum=5959b6cfe39e69f987a53c694950d5fa794ca6d5725ad9838f8ed04a2bab1b89 post_patch() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/clang-analyzer19 b/srcpkgs/clang-analyzer19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/clang-analyzer19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/clang-tools-extra19 b/srcpkgs/clang-tools-extra19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/clang-tools-extra19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/clang19 b/srcpkgs/clang19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/clang19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/clang19-devel b/srcpkgs/clang19-devel new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/clang19-devel @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/clang19-headers b/srcpkgs/clang19-headers new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/clang19-headers @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template index a57c75e1258..96f976bd36d 100644 --- a/srcpkgs/cliphist/template +++ b/srcpkgs/cliphist/template @@ -1,8 +1,9 @@ # Template file for 'cliphist' pkgname=cliphist -version=0.5.0 -revision=2 +version=0.6.1 +revision=1 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" @@ -11,4 +12,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=02285cf3358a1851e34f95c0c369b27284d8d0996759d759fa2bbcb5b30fb13d +checksum=db0f25ba3e9173dcb257d66cb1293e277a8bdfed11cc8d6b38b7473b0947781d diff --git a/srcpkgs/clj-kondo/template b/srcpkgs/clj-kondo/template new file mode 100644 index 00000000000..19a469f1a07 --- /dev/null +++ b/srcpkgs/clj-kondo/template @@ -0,0 +1,63 @@ +# 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 " +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 +} diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template index 201a9e912e5..054eaea558e 100644 --- a/srcpkgs/cloud-hypervisor/template +++ b/srcpkgs/cloud-hypervisor/template @@ -1,6 +1,6 @@ # Template file for 'cloud-hypervisor' pkgname=cloud-hypervisor -version=41.0 +version=42.0 revision=1 archs="aarch64* x86_64*" build_style=cargo @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " 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=6b25fea566f8deba48000292423bb6fab32c0bed7f6a37e6456e9a1fab0c0c00 +checksum=7cac4819630d953b3d10a867e1ea5e42f2236aed7a803faef16d8cd67554455c post_install() { vbin scripts/ch-trace-visualiser.py ch-trace-visualiser diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 1dbb72d522d..e5c94f31b1a 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -1,6 +1,6 @@ # Template file for 'cmus' pkgname=cmus -version=2.11.0 +version=2.12.0 revision=1 build_style=configure configure_args="prefix=/usr LD=$CC" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://cmus.github.io" distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz" -checksum=2bbdcd6bbbae301d734214eab791e3755baf4d16db24a44626961a489aa5e0f7 +checksum=44b96cd5f84b0d84c33097c48454232d5e6a19cd33b9b6503ba9c13b6686bfc7 build_options="elogind" build_options_default="elogind" desc_option_elogind="Support MPRIS interface via elogind" diff --git a/srcpkgs/codeberg-cli/template b/srcpkgs/codeberg-cli/template index 7897a9db5e5..9f9e35649b7 100644 --- a/srcpkgs/codeberg-cli/template +++ b/srcpkgs/codeberg-cli/template @@ -1,7 +1,7 @@ # Template file for 'codeberg-cli' pkgname=codeberg-cli -version=0.4.3 -revision=2 +version=0.4.6 +revision=1 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=cf439a53846c93adf51bc0911da7489e59828b5be6ad0e50cecd4312e36c52b4 +checksum=62cbeed20fbe58b3829b0ad67e43c6821f3046cf8d98037d454698aee1c98b11 post_install() { vlicense LICENSE diff --git a/srcpkgs/compiler-rt19 b/srcpkgs/compiler-rt19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/compiler-rt19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template index 3f716f4ec72..96a512ce637 100644 --- a/srcpkgs/comrak/template +++ b/srcpkgs/comrak/template @@ -1,6 +1,6 @@ # Template file for 'comrak' pkgname=comrak -version=0.28.0 +version=0.29.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=7e1ef40ebf2a27faaad7c2068e32d2109726f6daf42ba64705e7a250a9b0a162 +checksum=3929895c2c3e42d0d1a6efddd66a3c62282b81b62dd74229f6c8f31ac1dcb333 post_install() { vlicense COPYING diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template index 2beb4c72da7..d0f38678f41 100644 --- a/srcpkgs/console-setup/template +++ b/srcpkgs/console-setup/template @@ -1,6 +1,6 @@ # Template file for 'console-setup' pkgname=console-setup -version=1.230 +version=1.232 revision=1 hostmakedepends="perl" depends="kbd ckbcomp" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " 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=cef9885ce5a1b5a1d32fc6e95e1890ac717f156646de275a6fac0307dcbbd5ed +checksum=5eed5aef9ae3aee0bb0d3e6815d788c6ac003c5beee39536ab2c1e53d0cd8f7c conf_files="/etc/console-setup/console-setup /etc/console-setup/keyboard" diff --git a/srcpkgs/cpanminus/template b/srcpkgs/cpanminus/template index 68c64e98308..2e693cc2ed5 100644 --- a/srcpkgs/cpanminus/template +++ b/srcpkgs/cpanminus/template @@ -1,6 +1,6 @@ # Template file for 'cpanminus' pkgname=cpanminus -version=1.7047 +version=1.7048 revision=1 build_style=perl-module hostmakedepends="perl" @@ -11,4 +11,4 @@ maintainer="Leah Neukirchen " 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=963e63c6e1a8725ff2f624e9086396ae150db51dd0a337c3781d09a994af05a5 +checksum=59b60907ab9fa4f72ca2004fbe6054911439ae9a906890b4d842a87b25f20f3c diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template index 5d309f2ce41..9c68174e051 100644 --- a/srcpkgs/cpuid/template +++ b/srcpkgs/cpuid/template @@ -1,6 +1,6 @@ # Template file for 'cpuid' pkgname=cpuid -version=20240916 +version=20241023 revision=1 archs="i686* x86_64*" build_style=gnu-makefile @@ -10,6 +10,6 @@ maintainer="Gerardo Di Iorio " 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=4fa933b9d571349d8cfff29942769b793d4ce808eb97b594bbbf86d4d017293d +checksum=fc77435a8d5d2b3551713301e8cdb83e62a3cfedc84132b0ec9b1bb5e5244fdc conflicts="msr-tools" diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template index 44e028191d9..2d04b91c013 100644 --- a/srcpkgs/crash/template +++ b/srcpkgs/crash/template @@ -1,6 +1,6 @@ # Template file for 'crash' pkgname=crash -version=8.0.5 +version=8.0.6 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=b3ec57a844706ef044b607ba67bc5ef62d9deef8aec3fb2d7ea4f77dff24f1ef +checksum=fb918ade7faf9b1f76c7bd371a2aebf639bf10197134d3ba776e13a1867104fb nocross=yes disable_parallel_build=yes LDFLAGS="-llzo2" diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index a0da4f2cd33..03f0ecfd882 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -1,7 +1,7 @@ # Template file for 'cronie' pkgname=cronie version=1.7.2 -revision=1 +revision=2 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" +conf_files="/etc/anacrontab /etc/pam.d/crond /etc/cron.deny /etc/default/anacron" provides="cron-daemon-0_1" alternatives=" diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template index ef104157477..62f225ee15c 100644 --- a/srcpkgs/cropgui/template +++ b/srcpkgs/cropgui/template @@ -1,6 +1,6 @@ # Template file for 'cropgui' pkgname=cropgui -version=0.8 +version=0.9 revision=1 hostmakedepends="which python3-setuptools" depends="python3-Pillow python3-gobject libjpeg-turbo-tools ImageMagick exiftool gtk+3" @@ -9,7 +9,7 @@ maintainer="Eloi Torrents " license="GPL-2.0-or-later" homepage="https://github.com/jepler/cropgui" distfiles="https://github.com/jepler/cropgui/archive/v${version}.tar.gz" -checksum=8c874ccf12aab918fe3998360e18f58af1a84ca42014ab84bca1e8592e122930 +checksum=fc522bbd28b7822470728cf3855f35fd9994640f105f2851e6f055e8e21565b6 python_version=3 do_install() { diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template index b9de1c4760d..3f051d345c7 100644 --- a/srcpkgs/crun/template +++ b/srcpkgs/crun/template @@ -1,6 +1,6 @@ # Template file for 'crun' pkgname=crun -version=1.17 +version=1.18.1 revision=1 build_style=gnu-configure configure_args="--disable-systemd" @@ -8,11 +8,11 @@ hostmakedepends="pkg-config python3 $(vopt_if man go-md2man)" makedepends="libcap-devel libseccomp-devel yajl-devel" short_desc="Lightweight OCI runtime written in C" maintainer="Imran Khan " -license="GPL-2.0-or-later, LGPL-2.1-or-later" +license="GPL-2.0-or-later AND LGPL-2.1-or-later" homepage="https://github.com/containers/crun" changelog="https://raw.githubusercontent.com/containers/crun/main/NEWS" distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz" -checksum=b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874 +checksum=390cbbb022457aa705c802ad7ba9a5aace8562192d57365ce8bed0325770c6bc # most of the tests don't work inside a container make_check=no diff --git a/srcpkgs/cups-browsed/template b/srcpkgs/cups-browsed/template index e4bd2038d93..40674074508 100644 --- a/srcpkgs/cups-browsed/template +++ b/srcpkgs/cups-browsed/template @@ -1,6 +1,6 @@ # Template file for 'cups-browsed' pkgname=cups-browsed -version=2.0.1 +version=2.1.0 revision=1 build_style=gnu-configure conf_files="/etc/cups/cups-browsed.conf" @@ -13,7 +13,7 @@ license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception" homepage="https://github.com/OpenPrinting/cups-browsed" changelog="https://github.com/OpenPrinting/cups-browsed/blob/master/CHANGES.md" distfiles="https://github.com/OpenPrinting/cups-browsed/releases/download/${version}/cups-browsed-${version}.tar.xz" -checksum=ebed1b49dea593912b15fe55f88b691c1a0ac7d6c42178e9526ea949d00ef01a +checksum=2a1c0b3185d33e03e29bd13cbee07e2c511a7c4744048b094bb78895f1b00129 make_check=no # hangs lib32disabled=yes diff --git a/srcpkgs/curl/patches/fix-content-encoding.patch b/srcpkgs/curl/patches/fix-content-encoding.patch new file mode 100644 index 00000000000..f64546b6e08 --- /dev/null +++ b/srcpkgs/curl/patches/fix-content-encoding.patch @@ -0,0 +1,26 @@ +From 878bc429f26c27294787dc59d7b53345d9edc5aa Mon Sep 17 00:00:00 2001 +From: Jesus Malo Poyatos +Date: Thu, 7 Nov 2024 14:00:53 +0100 +Subject: [PATCH] setopt: fix CURLOPT_HTTP_CONTENT_DECODING + +Regression from 30da1f5974d34841b30c4f (shipped in 8.11.0) + +Fixes #15511 +Closes #15510 +--- + lib/setopt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/setopt.c b/lib/setopt.c +index 4f0697212739ef..ba80644bc73279 100644 +--- a/lib/setopt.c ++++ b/lib/setopt.c +@@ -1146,7 +1146,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option, + /* + * raw data passed to the application when content encoding is used + */ +- data->set.http_ce_skip = enabled; ++ data->set.http_ce_skip = !enabled; /* reversed */ + break; + + #if !defined(CURL_DISABLE_FTP) || defined(USE_SSH) diff --git a/srcpkgs/curl/patches/fix-netrc.patch b/srcpkgs/curl/patches/fix-netrc.patch new file mode 100644 index 00000000000..39ecce44dde --- /dev/null +++ b/srcpkgs/curl/patches/fix-netrc.patch @@ -0,0 +1,214 @@ +From d8010d956f09069d1d6b474abdee5864569e6920 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 7 Nov 2024 08:52:38 +0100 +Subject: [PATCH] duphandle: also init netrc + +The netrc init was only done in the Curl_open, meaning that a duplicated +handle would not get inited properly. + +Added test 2309 to verify. It does netrc auth with a duplicated handle. + +Regression from 3b43a05 + +Reported-by: tranzystorekk on github +Fixes #15496 +Closes #15... +--- + lib/easy.c | 1 + + tests/data/Makefile.am | 2 +- + tests/data/test2309 | 63 ++++++++++++++++++++++++++++++++++++ + tests/libtest/Makefile.inc | 5 ++- + tests/libtest/lib2309.c | 66 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 135 insertions(+), 2 deletions(-) + create mode 100644 tests/data/test2309 + create mode 100644 tests/libtest/lib2309.c + +diff --git a/lib/easy.c b/lib/easy.c +index d16fa8c07afec0..ac8fab34220d9b 100644 +--- a/lib/easy.c ++++ b/lib/easy.c +@@ -940,6 +940,7 @@ CURL *curl_easy_duphandle(CURL *d) + goto fail; + + Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER); ++ Curl_netrc_init(&outcurl->state.netrc); + + /* the connection pool is setup on demand */ + outcurl->state.lastconnect_id = -1; +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index 02bf2ae25bfd49..ea5221c00fd419 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -255,7 +255,7 @@ test2100 \ + test2200 test2201 test2202 test2203 test2204 test2205 \ + \ + test2300 test2301 test2302 test2303 test2304 test2305 test2306 test2307 \ +-test2308 \ ++test2308 test2309 \ + \ + test2400 test2401 test2402 test2403 test2404 test2405 test2406 \ + \ +diff --git a/tests/data/test2309 b/tests/data/test2309 +new file mode 100644 +index 00000000000000..a7ab8ed83b4945 +--- /dev/null ++++ b/tests/data/test2309 +@@ -0,0 +1,63 @@ ++ ++ ++ ++netrc ++HTTP ++ ++ ++# ++# Server-side ++ ++ ++HTTP/1.1 200 OK ++Date: Tue, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT ++ETag: "21025-dc7-39462498" ++Accept-Ranges: bytes ++Content-Length: 6 ++Connection: close ++Content-Type: text/html ++Funny-head: yesyes ++ ++-foo- ++ ++ ++ ++# ++# Client-side ++ ++ ++http ++ ++ ++# Reproducing issue 15496 ++ ++HTTP with .netrc using duped easy handle ++ ++ ++lib%TESTNUMBER ++ ++ ++http://github.com %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ ++ ++ ++ ++machine github.com ++ ++login daniel ++password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1 ++ ++ ++ ++ ++ ++GET http://github.com/ HTTP/1.1 ++Host: github.com ++Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64% ++Accept: */* ++Proxy-Connection: Keep-Alive ++ ++ ++ ++ +diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc +index 339a00fc4ed41e..8f58fd64229d5c 100644 +--- a/tests/libtest/Makefile.inc ++++ b/tests/libtest/Makefile.inc +@@ -77,7 +77,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq \ + lib1945 lib1946 lib1947 lib1948 lib1955 lib1956 lib1957 lib1958 lib1959 \ + lib1960 lib1964 \ + lib1970 lib1971 lib1972 lib1973 lib1974 lib1975 \ +- lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 \ ++ lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 lib2309 \ + lib2402 lib2404 lib2405 \ + lib2502 \ + lib3010 lib3025 lib3026 lib3027 \ +@@ -683,6 +683,9 @@ lib2306_LDADD = $(TESTUTIL_LIBS) + lib2308_SOURCES = lib2308.c $(SUPPORTFILES) + lib2308_LDADD = $(TESTUTIL_LIBS) + ++lib2309_SOURCES = lib2309.c $(SUPPORTFILES) ++lib2309_LDADD = $(TESTUTIL_LIBS) ++ + lib2402_SOURCES = lib2402.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) + lib2402_LDADD = $(TESTUTIL_LIBS) + +diff --git a/tests/libtest/lib2309.c b/tests/libtest/lib2309.c +new file mode 100644 +index 00000000000000..009ff92817ab8c +--- /dev/null ++++ b/tests/libtest/lib2309.c +@@ -0,0 +1,66 @@ ++/*************************************************************************** ++ * _ _ ____ _ ++ * Project ___| | | | _ \| | ++ * / __| | | | |_) | | ++ * | (__| |_| | _ <| |___ ++ * \___|\___/|_| \_\_____| ++ * ++ * Copyright (C) Daniel Stenberg, , et al. ++ * ++ * This software is licensed as described in the file COPYING, which ++ * you should have received as part of this distribution. The terms ++ * are also available at https://curl.se/docs/copyright.html. ++ * ++ * You may opt to use, copy, modify, merge, publish, distribute and/or sell ++ * copies of the Software, and permit persons to whom the Software is ++ * furnished to do so, under the terms of the COPYING file. ++ * ++ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY ++ * KIND, either express or implied. ++ * ++ * SPDX-License-Identifier: curl ++ * ++ ***************************************************************************/ ++ ++#include "test.h" ++#include "testtrace.h" ++ ++#include ++ ++static size_t cb_curl(char *buffer, size_t size, size_t nmemb, void *userp) ++{ ++ (void)buffer; ++ (void)size; ++ (void)nmemb; ++ (void)userp; ++ return CURL_WRITEFUNC_ERROR; ++} ++ ++CURLcode test(char *URL) ++{ ++ CURL *curl; ++ CURL *curldupe; ++ CURLcode res = CURLE_OK; ++ ++ global_init(CURL_GLOBAL_ALL); ++ curl = curl_easy_init(); ++ if(curl) { ++ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cb_curl); ++ curl_easy_setopt(curl, CURLOPT_URL, URL); ++ curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); ++ curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg3); ++ curl_easy_setopt(curl, CURLOPT_NETRC, (long)CURL_NETRC_REQUIRED); ++ curl_easy_setopt(curl, CURLOPT_NETRC_FILE, libtest_arg2); ++ ++ curldupe = curl_easy_duphandle(curl); ++ if(curldupe) { ++ res = curl_easy_perform(curldupe); ++ printf("Returned %d, should be %d.\n", res, CURLE_WRITE_ERROR); ++ fflush(stdout); ++ curl_easy_cleanup(curldupe); ++ } ++ curl_easy_cleanup(curl); ++ } ++ curl_global_cleanup(); ++ return CURLE_OK; ++} diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 8b188751bdd..30a17c5eb99 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,10 +1,10 @@ # Template file for 'curl' pkgname=curl -version=8.10.1 -revision=1 +version=8.11.0 +revision=3 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 - --enable-websockets --with-random=/dev/urandom + --with-random=/dev/urandom $(vopt_with rtmp librtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls) $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd) $(vopt_with psl libpsl) $(vopt_with idn libidn2) @@ -30,7 +30,7 @@ license="MIT" homepage="https://curl.se" changelog="https://curl.se/changes.html" distfiles="https://curl.se/download/curl-${version}.tar.gz" -checksum=d15ebab765d793e2e96db090f0e172d127859d78ca6f6391d7eafecfd894bbc0 +checksum=264537d90e58d2b09dddc50944baf3c38e7089151c8986715e2aaeaaf2b8118f build_options="gnutls gssapi idn ldap psl rtmp ssh ssl zstd" build_options_default="idn psl ssh ssl zstd" vopt_conflict ssl gnutls diff --git a/srcpkgs/czkawka/template b/srcpkgs/czkawka/template index d2f944b070d..f2463ba0b1b 100644 --- a/srcpkgs/czkawka/template +++ b/srcpkgs/czkawka/template @@ -1,11 +1,11 @@ # Template file for 'czkawka' pkgname=czkawka -version=7.0.0 +version=8.0.0 revision=1 build_style=cargo configure_args="--bin czkawka_cli --bin czkawka_gui --all-features" hostmakedepends="pkg-config" -makedepends="libheif-devel gtk4-devel libraw-devel" +makedepends="libdav1d-devel libheif-devel gtk4-devel libraw-devel" depends="ffmpeg" checkdepends="dbus xvfb-run" short_desc="App to find duplicates, empty folders, similar images, etc" @@ -14,7 +14,7 @@ license="MIT" homepage="https://github.com/qarmin/czkawka" changelog="https://raw.githubusercontent.com/qarmin/czkawka/master/Changelog.md" distfiles="https://github.com/qarmin/czkawka/archive/refs/tags/${version}.tar.gz" -checksum=ce7d072056dedc4f2ca4d3647dc786ba071d4f3c58e79415da18d7dafd62e87b +checksum=df67ca80b1307e8497afee057e139498ff5d80edc65e6c1f14b467bdf212033d make_check_pre="dbus-run-session xvfb-run" do_install() { diff --git a/srcpkgs/dbeaver/patches/force-jdk17.patch b/srcpkgs/dbeaver/patches/force-jdk17.patch index 32cc29fa147..11097450a3f 100644 --- a/srcpkgs/dbeaver/patches/force-jdk17.patch +++ b/srcpkgs/dbeaver/patches/force-jdk17.patch @@ -6,6 +6,6 @@ - + -vm /usr/lib/jvm/openjdk17/bin - -vm ../Eclipse/jre/Contents/Home/lib/libjli.dylib - - + --launcher.additionalVmargs %XDG_DATA_HOME%/DBeaverData/settings/dbeaver.vmoptions %HOME%/.local/share/DBeaverData/settings/dbeaver.vmoptions + --launcher.additionalVmargs %APPDATA%\DBeaverData\settings\dbeaver.exe.vmoptions + --launcher.additionalVmargs %HOME%/Library/DBeaverData/settings/dbeaver.vmoptions -vm ../Eclipse/jre/Contents/Home/lib/libjli.dylib diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index 1b809bf7a0d..2eed3f54e6b 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,8 +1,8 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=24.2.1 +version=24.2.3 revision=1 -_common_commit=723909b552f621c5d087706cf35c9695c643e796 +_common_commit=605757efc02bf2d55f00d1b64f1b7f00f2819eb4 # the build downloads binaries linked to glibc archs="x86_64 aarch64" build_wrksrc="dbeaver" @@ -15,8 +15,8 @@ homepage="https://dbeaver.io" changelog="https://dbeaver.io/news/" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz https://github.com/dbeaver/dbeaver-common/archive/${_common_commit}.tar.gz" -checksum="f4e260f2660aad0eeafce4a28bb3eccdbed2cf2ed8195ba2b3518ca779bb0daa - 36e2bfad92fd27ef7f563047f7c1b55fdb65f70313ea7789d34f1ed2c223df9f" +checksum="367d3e8e712ffb4868026f543e8386d395dc5f33250ef12286669b7a95be983d + 6f45062fb5c7e9489ee5d801c1821af0eb54bbc6ad26eed03f91ed88db8ab681" nopie=true post_extract() { diff --git a/srcpkgs/dfc/template b/srcpkgs/dfc/template index 3b351375dcd..e56c7ae956f 100644 --- a/srcpkgs/dfc/template +++ b/srcpkgs/dfc/template @@ -8,7 +8,7 @@ hostmakedepends="gettext" short_desc="Display file system space usage using graphs and colors" maintainer="Orphaned " license="BSD-3-Clause" -homepage="http://projects.gw-computing.net/projects/dfc" +homepage="https://github.com/Rolinh/dfc" distfiles="https://github.com/Rolinh/dfc/archive/v${version}.tar.gz" checksum=cea18fab1f053eddc359530816712edd1f497c556035a7c4d63ac87a4abc4b28 conf_files="/etc/xdg/dfc/dfcrc" diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 6df8c53f314..fa1954df748 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,6 +1,6 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=10.0.10 +version=10.1.0 revision=1 build_style=configure make_check_target=test @@ -15,7 +15,7 @@ license="BSD-2-Clause" homepage="https://roy.marples.name/projects/dhcpcd" changelog="https://github.com/NetworkConfiguration/dhcpcd/releases" distfiles="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v${version}.tar.gz" -checksum=3ea87ba6c37ec594620fbaa7f2f6bc1dd8893e0aa5db5c40f532b700d05fe03f +checksum=e8a83208c2ff63a5a31d886f76bc717b4ec1938d18a2c8b88f328e710d2b515a lib32disabled=yes conf_files=/etc/dhcpcd.conf diff --git a/srcpkgs/difftastic/template b/srcpkgs/difftastic/template index 1269b1df500..b862c0c93f6 100644 --- a/srcpkgs/difftastic/template +++ b/srcpkgs/difftastic/template @@ -1,6 +1,6 @@ # Template file for 'difftastic' pkgname=difftastic -version=0.60.0 +version=0.61.0 revision=1 build_style=cargo short_desc="Structural diff tool that understands syntax" @@ -9,7 +9,7 @@ license="MIT" homepage="https://difftastic.wilfred.me.uk" changelog="https://raw.githubusercontent.com/Wilfred/difftastic/master/CHANGELOG.md" distfiles="https://github.com/Wilfred/difftastic/archive/refs/tags/${version}.tar.gz" -checksum=4346b269240f3beff153758d0a2313accc79645ee21b36cfcc71ac0fca5d9b5d +checksum=8e85001e32f1fe7b2c6d164f3a654cb589c6e48b6350421df27a56919da7a185 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then XBPS_CROSS_RUSTFLAGS+=" -latomic" diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 438f5b90dcb..3d1682ba276 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,7 +1,7 @@ # Template file for 'digikam' pkgname=digikam -version=8.4.0 -revision=4 +version=8.5.0 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON @@ -25,7 +25,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.digikam.org" distfiles="${KDE_SITE}/digikam/${version}/digiKam-${version}.tar.xz" -checksum=53c8aca5a2f660173e29a860d8b13844bd0ec748ef3f618c42f7689476494481 +checksum=5c4eaafbca59425a0fe8cb41e7d7a08446defbbb967528bb1148aed0e0d0e975 # TODO add marble back when it's ported to Qt6 diff --git a/srcpkgs/dinit/template b/srcpkgs/dinit/template index 60645bcb00f..8b3fa5068fc 100644 --- a/srcpkgs/dinit/template +++ b/srcpkgs/dinit/template @@ -1,11 +1,11 @@ # Template file for 'dinit' pkgname=dinit -version=0.18.0 +version=0.19.1 revision=1 build_style=meson configure_args=" -Ddinit-sbindir=/usr/bin - -Dbuild-shutdown=disabled + -Dshutdown-prefix=dinit- -Dunit-tests=true -Digr-tests=true -Db_ndebug=false" @@ -16,4 +16,10 @@ license="Apache-2.0" homepage="https://davmac.org/projects/dinit/" changelog="https://raw.githubusercontent.com/davmac314/dinit/master/NEWS" distfiles="https://github.com/davmac314/dinit/archive/v${version}.tar.gz" -checksum=ec854903e93416b3f65e72009dcde4965869d8793e2314565484d94ede534e48 +checksum=e4ef40844ce64ca7476b9acba2adabdca49a2b59c97641a99e7d47904701a5f5 + +post_install() { + vmkdir usr/share/doc/dinit + vcopy doc/linux/* usr/share/doc/dinit/ + vdoc doc/getting_started.md +} diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template index e69750f7435..7a18601f00e 100644 --- a/srcpkgs/direnv/template +++ b/srcpkgs/direnv/template @@ -1,7 +1,7 @@ # Template file for 'direnv' pkgname=direnv -version=2.34.0 -revision=2 +version=2.35.0 +revision=1 build_style=go go_import_path=github.com/direnv/direnv/v2 short_desc="Environment switcher for the shell" @@ -10,7 +10,7 @@ license="MIT" homepage="https://direnv.net/" changelog="https://raw.githubusercontent.com/direnv/direnv/master/CHANGELOG.md" distfiles="https://github.com/direnv/direnv/archive/refs/tags/v${version}.tar.gz" -checksum=3d7067e71500e95d69eac86a271a6b6fc3f2f2817ba0e9a589524bf3e73e007c +checksum=a7aaec49d1b305f0745dad364af967fb3dc9bb5befc9f29d268d528b5a474e57 post_install() { vlicense LICENSE diff --git a/srcpkgs/discord/template b/srcpkgs/discord/template index e0ffefbb338..81bd9d98beb 100644 --- a/srcpkgs/discord/template +++ b/srcpkgs/discord/template @@ -1,6 +1,6 @@ # Template file for 'discord' pkgname=discord -version=0.0.71 +version=0.0.75 revision=1 archs="x86_64" depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic @@ -10,7 +10,7 @@ maintainer="Ryan Conwell " license="custom:Proprietary" homepage="https://discord.com" distfiles="https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz" -checksum=3cc71abe05212fc735605696b28a1939b0daec03cca820f521acac103e5f59a7 +checksum=9a4ab273d0a8f229de2fa75c24a691243e13546d516228fffce833321fed2c30 repository=nonfree restricted=yes nopie=yes diff --git a/srcpkgs/docker-buildx/patches/fix-tests.patch b/srcpkgs/docker-buildx/patches/fix-tests.patch new file mode 100644 index 00000000000..333efdecb5d --- /dev/null +++ b/srcpkgs/docker-buildx/patches/fix-tests.patch @@ -0,0 +1,27 @@ +Disable integration tests that fail in CI. +Use git version for sanity check (tests expect to be running form git repo, not a tarball). +diff --git i/tests/integration_test.go w/tests/integration_test.go +index 9cd76c..2811de 100644 +--- i/tests/integration_test.go ++++ w/tests/integration_test.go +@@ -20,6 +20,7 @@ func init() { + } + + func TestIntegration(t *testing.T) { ++ t.Skip() + var tests []func(t *testing.T, sb integration.Sandbox) + tests = append(tests, commonTests...) + tests = append(tests, buildTests...) +diff --git i/util/gitutil/gitutil_test.go w/util/gitutil/gitutil_test.go +index 06c6fa..0b8cf9 100644 +--- i/util/gitutil/gitutil_test.go ++++ w/util/gitutil/gitutil_test.go +@@ -10,7 +10,7 @@ func TestGit(t *testing.T) { + c, err := New() + require.NoError(t, err) + +- out, err := c.run("status") ++ out, err := c.run("version") + require.NoError(t, err) + require.NotEmpty(t, out) + diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template index 22ae8c6dd4e..90933ea2281 100644 --- a/srcpkgs/docker-buildx/template +++ b/srcpkgs/docker-buildx/template @@ -1,18 +1,19 @@ # Template file for 'docker-buildx' pkgname=docker-buildx -version=0.17.0 +version=0.18.0 revision=1 build_style=go go_import_path="github.com/docker/buildx" go_package="./cmd/buildx" go_ldflags="-X github.com/docker/buildx/version.Version=v${version}" depends="docker-cli" +checkdepends="git" short_desc="Docker CLI plugin for extended build capabilities with BuildKit" maintainer="Daniel Lewan " license="Apache-2.0" homepage="https://docs.docker.com/buildx/working-with-buildx/" distfiles="https://github.com/docker/buildx/archive/refs/tags/v${version}.tar.gz" -checksum=f846f36dc93d78e9b1c94b716279a04f1d6f58ef5d445c6615ec8e5e3a7b5efa +checksum=a935cb2715a5054d918d40ef07cdd4a6465b20a755d466248718ab59fd41c334 post_install() { vmkdir usr/libexec/docker/cli-plugins diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template index 384ac357eb0..85d562d3dde 100644 --- a/srcpkgs/docker-gen/template +++ b/srcpkgs/docker-gen/template @@ -1,6 +1,6 @@ # Template file for 'docker-gen' pkgname=docker-gen -version=0.14.2 +version=0.14.3 revision=1 build_style=go go_import_path="github.com/nginx-proxy/docker-gen" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/nginx-proxy/docker-gen" distfiles="https://github.com/nginx-proxy/docker-gen/archive/refs/tags/${version}.tar.gz" -checksum=52ae0f2e299a505dfc92fee79dd34ed5efa91c132bf2adfb52e607f93e4776ea +checksum=90635588bdf7ffdd5875e4cc053066c5e348e94907d976e9d4298878d49ac587 post_install() { vlicense LICENSE diff --git a/srcpkgs/dpp/patches/fix_ctime.diff b/srcpkgs/dpp/patches/fix_ctime.diff new file mode 100644 index 00000000000..0eaacb9f98d --- /dev/null +++ b/srcpkgs/dpp/patches/fix_ctime.diff @@ -0,0 +1,13 @@ +diff --git a/include/dpp/sslclient.h b/include/dpp/sslclient.h +index 00371ef287..cd1828fcb1 100644 + +--- a/include/dpp/sslclient.h + ++++ b/include/dpp/sslclient.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include diff --git a/srcpkgs/dpp/template b/srcpkgs/dpp/template index c33126671b4..f5f81c7b6a3 100644 --- a/srcpkgs/dpp/template +++ b/srcpkgs/dpp/template @@ -1,6 +1,6 @@ # Template file for 'dpp' pkgname=dpp -version=10.0.32 +version=10.0.34 revision=1 build_style=cmake configure_args="-DDPP_NO_VCPKG=ON -DDPP_USE_EXTERNAL_JSON=ON -DDPP_CORO=ON" @@ -12,7 +12,7 @@ maintainer="Lunar Starstrum " license=Apache-2.0 homepage="https://dpp.dev" distfiles="https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${version}.tar.gz" -checksum=b366c0eb05539208e8d6c81f59de87b2aa6158250968d1bd6360676d576851e7 +checksum=58eee75e81ac305db0b71a8cd4b821ff3cabcdfa0575e56ba5e4ce543531bd2f dpp-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/dq/template b/srcpkgs/dq/template index 68784b0817b..437716ba060 100644 --- a/srcpkgs/dq/template +++ b/srcpkgs/dq/template @@ -1,6 +1,6 @@ # Template file for 'dq' pkgname=dq -version=0.0.20240101 +version=0.0.20241027 revision=1 build_style=gnu-makefile make_dirs=" @@ -13,9 +13,10 @@ conf_files=" short_desc="Recursive DNS/DNSCurve server and cli tool to debug DNS/DNSCurve" maintainer="Duncaen " license="CC0-1.0" -homepage="https://mojzis.com/software/dq/" +homepage="https://github.com/janmojzis/dq" +changelog="https://github.com/janmojzis/dq/releases" distfiles="https://github.com/janmojzis/dq/archive/${version##*.}.tar.gz" -checksum=a86b697e4c23568d9aacc93dea8cfaae0d889dfb22509e0491f9de3d80adf9c3 +checksum=413a7aa97a31bc81886aea943dce39b674da2ec5a205f6d7c5cda7c365b9e1fb system_accounts="_dqcache" diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch deleted file mode 100644 index 6d3295c8e26..00000000000 --- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Mon, 14 Aug 2023 12:28:11 +0200 -Subject: [PATCH] fix(dracut.sh): remove microcode check based on - CONFIG_MICROCODE_[AMD|INTEL] - -`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since -https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore -this check is wrong and early microcode is always disabled. ---- - dracut.sh | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index e0abdb3b0..3b292910f 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1561,23 +1561,20 @@ fi - - if [[ $early_microcode == yes ]]; then - if [[ $hostonly ]]; then -- if [[ $(get_cpu_vendor) == "AMD" ]]; then -- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode -- elif [[ $(get_cpu_vendor) == "Intel" ]]; then -- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode -+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then -+ check_kernel_config CONFIG_MICROCODE || unset early_microcode - else - unset early_microcode - fi - else -- ! check_kernel_config CONFIG_MICROCODE_AMD \ -- && ! check_kernel_config CONFIG_MICROCODE_INTEL \ -+ ! check_kernel_config CONFIG_MICROCODE \ - && unset early_microcode - fi - # Do not complain on non-x86 architectures as it makes no sense - case "${DRACUT_ARCH:-$(uname -m)}" in - x86_64 | i?86) - [[ $early_microcode != yes ]] \ -- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y" -+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y" - ;; - *) ;; - esac diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch deleted file mode 100644 index a2ea1288d23..00000000000 --- a/srcpkgs/dracut/patches/amd-ucode-readme.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Mon, 30 Oct 2023 14:56:39 +0100 -Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation - -This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07 -and it should be skipped. - -Fixes #2541 ---- - dracut.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dracut.sh b/dracut.sh -index 3b292910f..bd730cbe9 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then - done - for i in $_fwdir/$_fw/$_src; do - [[ -e $i ]] || continue -+ # skip README{.xz,.zst,...} -+ str_starts "$i" "$_fwdir/$_fw/README" && continue - # skip gpg files - str_ends "$i" ".asc" && continue - cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}" diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch deleted file mode 100644 index 39fd3dd3c65..00000000000 --- a/srcpkgs/dracut/patches/crypt-openssl-3.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= -Date: Mon, 13 Feb 2023 20:22:56 +0000 -Subject: [PATCH] fix(crypt): add missing libraries - -Add missing libraries, closes #2137 ---- - modules.d/90crypt/module-setup.sh | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/modules.d/90crypt/module-setup.sh -+++ b/modules.d/90crypt/module-setup.sh -@@ -176,5 +176,11 @@ install() { - systemd-ask-password systemd-tty-ask-password-agent - fi - -+ # Install required libraries. -+ _arch=${DRACUT_ARCH:-$(uname -m)} -+ inst_libdir_file \ -+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \ -+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so" -+ - dracut_need_initqueue - } diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch deleted file mode 100644 index 97c72d05e55..00000000000 --- a/srcpkgs/dracut/patches/fix-fsck.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/dracutdevs/dracut/pull/2262 - -From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001 -From: Laszlo Gombos -Date: Sat, 4 Mar 2023 23:28:17 +0000 -Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the - e2fsck call - -Fix regression. ---- - modules.d/99fs-lib/fs-lib.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh -index dd20731f2..c4640fa8a 100755 ---- a/modules.d/99fs-lib/fs-lib.sh -+++ b/modules.d/99fs-lib/fs-lib.sh -@@ -107,7 +107,8 @@ fsck_drv_com() { - - info "issuing $_drv $_fop $_dev" - # we enforce non-interactive run, so $() is fine -- _out=$($_drv "$_fop" "$_dev") -+ # shellcheck disable=SC2086 -+ _out=$($_drv $_fop "$_dev") - _ret=$? - fsck_tail - diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch deleted file mode 100644 index 9056685e32b..00000000000 --- a/srcpkgs/dracut/patches/force_poweroff.patch +++ /dev/null @@ -1,30 +0,0 @@ -The shutdown binary is actually provided by runit and expects the runit -init to be running. This is not the case in the initramfs. Forcing the -shutdown, halt or reboot is necessary to ignore this requirement. - ---- - modules.d/99base/dracut-lib.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh ---- a/modules.d/99base/dracut-lib.sh -+++ b/modules.d/99base/dracut-lib.sh -@@ -1004,13 +1004,13 @@ emergency_shell() { - - case "$_emergency_action" in - reboot) -- reboot || exit 1 -+ reboot -f || exit 1 - ;; - poweroff) -- poweroff || exit 1 -+ poweroff -f || exit 1 - ;; - halt) -- halt || exit 1 -+ halt -f || exit 1 - ;; - esac - } --- -2.37.3 diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch deleted file mode 100644 index b80e966266b..00000000000 --- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch +++ /dev/null @@ -1,25 +0,0 @@ -This upstream accepted patch fixes a bug where the live images don't work when -booted from grub loopback (void-linux/void-mklive#294). - -From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001 -From: 0x5c -Date: Thu, 9 Feb 2023 05:26:30 -0500 -Subject: [PATCH] fix: make iso-scan trigger udev events - -Fixes #2183 ---- - modules.d/90dmsquash-live/iso-scan.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh -index 886d23033..fa06b33cd 100755 ---- a/modules.d/90dmsquash-live/iso-scan.sh -+++ b/modules.d/90dmsquash-live/iso-scan.sh -@@ -22,6 +22,7 @@ do_iso_scan() { - mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue - if [ -f "/run/initramfs/isoscan/$isofile" ]; then - losetup -f "/run/initramfs/isoscan/$isofile" -+ udevadm trigger --action=add > /dev/null 2>&1 - ln -s "$dev" /run/initramfs/isoscandev - rm -f -- "$job" - exit 0 diff --git a/srcpkgs/dracut/patches/musl-1.1.patch b/srcpkgs/dracut/patches/musl-1.1.patch new file mode 100644 index 00000000000..2c73d1c5bf0 --- /dev/null +++ b/srcpkgs/dracut/patches/musl-1.1.patch @@ -0,0 +1,97 @@ +From c52069f7a0adab4b5c5b911a44d65d3ba0989d7e Mon Sep 17 00:00:00 2001 +From: classabbyamp +Date: Sat, 12 Oct 2024 20:06:12 -0400 +Subject: [PATCH] Revert "perf(dracut-install): stat() w/unused buf -> + access(F_OK) in dracut-install" + +This reverts commit e7ed8337bb9fec0283af5dc745450394ba649a03. + +This commit broke compatibility with musl 1.1. +--- + src/install/dracut-install.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c +index 96bc2eb6..30c51a30 100644 +--- a/src/install/dracut-install.c ++++ b/src/install/dracut-install.c +@@ -812,7 +812,7 @@ static int dracut_mkdir(const char *src) + + static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir, bool resolvedeps, bool hashdst) + { +- struct stat sb; ++ struct stat sb, db; + _cleanup_free_ char *fullsrcpath = NULL; + _cleanup_free_ char *fulldstpath = NULL; + _cleanup_free_ char *fulldstdir = NULL; +@@ -898,7 +898,7 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir + return 1; + } + +- ret = access(fulldstdir, F_OK); ++ ret = stat(fulldstdir, &db); + + if (ret < 0) { + _cleanup_free_ char *dname = NULL; +@@ -958,12 +958,12 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir + return 1; + } + +- if (faccessat(AT_FDCWD, abspath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) { ++ if (lstat(abspath, &sb) != 0) { + log_debug("lstat '%s': %m", abspath); + return 1; + } + +- if (faccessat(AT_FDCWD, fulldstpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) { ++ if (lstat(fulldstpath, &sb) != 0) { + _cleanup_free_ char *absdestpath = NULL; + + _asprintf(&absdestpath, "%s/%s", destrootdir, +@@ -1313,6 +1313,7 @@ static char **find_binary(const char *src) + char *newsrc = NULL; + + STRV_FOREACH(q, pathdirs) { ++ struct stat sb; + char *fullsrcpath; + + _asprintf(&newsrc, "%s/%s", *q, src); +@@ -1325,8 +1326,8 @@ static char **find_binary(const char *src) + continue; + } + +- if (faccessat(AT_FDCWD, fullsrcpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) { +- log_debug("lstat(%s) != 0", fullsrcpath); ++ if (lstat(fullsrcpath, &sb) != 0) { ++ log_debug("stat(%s) != 0", fullsrcpath); + free(newsrc); + newsrc = NULL; + free(fullsrcpath); +@@ -1441,8 +1442,9 @@ static int install_firmware_fullpath(const char *fwpath) + { + const char *fw = fwpath; + _cleanup_free_ char *fwpath_compressed = NULL; ++ struct stat sb; + int ret; +- if (access(fwpath, F_OK) != 0) { ++ if (stat(fwpath, &sb) != 0) { + _asprintf(&fwpath_compressed, "%s.zst", fwpath); + if (access(fwpath_compressed, F_OK) != 0) { + strcpy(fwpath_compressed + strlen(fwpath) + 1, "xz"); +@@ -1485,11 +1487,12 @@ static int install_firmware(struct kmod_module *mod) + ret = -1; + STRV_FOREACH(q, firmwaredirs) { + _cleanup_free_ char *fwpath = NULL; ++ struct stat sb; + + _asprintf(&fwpath, "%s/%s", *q, value); + + if (strpbrk(value, "*?[") != NULL +- && access(fwpath, F_OK) != 0) { ++ && stat(fwpath, &sb) != 0) { + size_t i; + _cleanup_globfree_ glob_t globbuf; + +-- +2.46.0 + diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch deleted file mode 100644 index dce39fdc6f7..00000000000 --- a/srcpkgs/dracut/patches/network.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001 -From: Laszlo Gombos -Date: Wed, 18 Jan 2023 19:59:24 +0000 -Subject: [PATCH] meta module should check if module exists - -Bug: https://github.com/dracutdevs/dracut/issues/1756 ---- - modules.d/40network/module-setup.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 1ab13ef..078cb4b 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -17,15 +17,15 @@ depends() { - done - - if [ -z "$network_handler" ]; then -- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then -+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then - network_handler="network-wicked" -- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then -+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then - network_handler="connman" -- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then -+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then - network_handler="network-manager" -- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then -+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then - network_handler="systemd-networkd" -- else -+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then - network_handler="network-legacy" - fi - fi --- -2.34.1 diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch index 490dd63b310..1830b38644e 100644 --- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch +++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch @@ -1,11 +1,12 @@ +adds udev rule that allows plymouth to work + --- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300 +++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300 -@@ -39,6 +39,8 @@ - 60-persistent-storage.rules \ - 61-persistent-storage-edd.rules \ +@@ -49,6 +49,7 @@ + 70-mouse.rules \ + 70-touchpad.rules \ 70-uaccess.rules \ + 71-plymouth-seat.rules \ -+ 71-udev-seat.rules \ 71-seat.rules \ 73-seat-late.rules \ 75-net-description.rules \ diff --git a/srcpkgs/dracut/patches/revert-fw_devlink.patch b/srcpkgs/dracut/patches/revert-fw_devlink.patch new file mode 100644 index 00000000000..c34caa76451 --- /dev/null +++ b/srcpkgs/dracut/patches/revert-fw_devlink.patch @@ -0,0 +1,384 @@ +From daf80bbb8f8ca5c4ad56772f379110e7434cbc2c Mon Sep 17 00:00:00 2001 +From: classabbyamp +Date: Wed, 16 Oct 2024 13:45:35 -0400 +Subject: [PATCH] Revert "feat(dracut-install): add fw_devlink suppliers as + module dependencies" + +...and associated later changes, as they cause serious regressions with +aarch64 devices like the Lenovo X13s. + +see also https://github.com/dracut-ng/dracut-ng/issues/316 + +This reverts commit 8de0258d71dc5600d715d7534471e35b2b75c7be. +This reverts commit 07e2c4926780b672922563a6ea0bf1bd4bcfcd9f. +This reverts commit d71bec4aa444d92820e428c0629d0e75e268c815. +This reverts commit 6500e95494175819b382acbac8eafcdf72fabd6d. +This reverts commit 131822e26d76a3ce2028e9a545be2af066805629. +This reverts commit 3de4c7313260fb600507c9b87f780390b874c870. +--- + src/install/dracut-install.c | 245 +++-------------------------------- + 1 file changed, 15 insertions(+), 230 deletions(-) + +diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c +index 96bc2eb6..96644151 100644 +--- a/src/install/dracut-install.c ++++ b/src/install/dracut-install.c +@@ -83,9 +83,6 @@ FILE *logfile_f = NULL; + static Hashmap *items = NULL; + static Hashmap *items_failed = NULL; + static Hashmap *modules_loaded = NULL; +-static Hashmap *modules_suppliers = NULL; +-static Hashmap *processed_suppliers = NULL; +-static Hashmap *modalias_to_kmod = NULL; + static regex_t mod_filter_path; + static regex_t mod_filter_nopath; + static regex_t mod_filter_symbol; +@@ -98,7 +95,7 @@ static bool arg_mod_filter_nosymbol = false; + static bool arg_mod_filter_noname = false; + + static int dracut_install(const char *src, const char *dst, bool isdir, bool resolvedeps, bool hashdst); +-static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *modlist, Hashmap *suppliers_paths); ++static int install_dependent_modules(struct kmod_list *modlist); + + static void item_free(char *i) + { +@@ -1571,164 +1568,7 @@ static bool check_module_path(const char *path) + return true; + } + +-static int find_kmod_module_from_sysfs_driver(struct kmod_ctx *ctx, const char *sysfs_node, int sysfs_node_len, +- struct kmod_module **module) +-{ +- char mod_path[PATH_MAX], mod_realpath[PATH_MAX]; +- const char *mod_name; +- if ((size_t)snprintf(mod_path, sizeof(mod_path), "%.*s/driver/module", +- sysfs_node_len, sysfs_node) >= sizeof(mod_path)) +- return -1; +- +- if (realpath(mod_path, mod_realpath) == NULL) +- return -1; +- +- if ((mod_name = basename(mod_realpath)) == NULL) +- return -1; +- +- return kmod_module_new_from_name(ctx, mod_name, module); +-} +- +-static int find_kmod_module_from_sysfs_modalias(struct kmod_ctx *ctx, const char *sysfs_node, int sysfs_node_len, +- struct kmod_list **modules) +-{ +- char modalias_path[PATH_MAX]; +- if ((size_t)snprintf(modalias_path, sizeof(modalias_path), "%.*s/modalias", sysfs_node_len, +- sysfs_node) >= sizeof(modalias_path)) +- return -1; +- +- _cleanup_close_ int modalias_file = -1; +- if ((modalias_file = open(modalias_path, O_RDONLY | O_CLOEXEC)) == -1) +- return 0; +- +- char alias[page_size()]; +- ssize_t len = read(modalias_file, alias, sizeof(alias)); +- alias[len - 1] = '\0'; +- +- void *list; +- +- if (hashmap_get_exists(modalias_to_kmod, alias, &list) == 1) { +- *modules = list; +- return 0; +- } +- +- int ret = kmod_module_new_from_lookup(ctx, alias, modules); +- if (!ret) { +- hashmap_put(modalias_to_kmod, strdup(alias), *modules); +- } +- +- return ret; +-} +- +-static int find_modules_from_sysfs_node(struct kmod_ctx *ctx, const char *sysfs_node, Hashmap *modules) +-{ +- _cleanup_kmod_module_unref_ struct kmod_module *drv = NULL; +- struct kmod_list *list = NULL; +- struct kmod_list *l = NULL; +- +- if (find_kmod_module_from_sysfs_driver(ctx, sysfs_node, strlen(sysfs_node), &drv) >= 0) { +- char *module = strdup(kmod_module_get_name(drv)); +- if (hashmap_put(modules, module, module) < 0) +- free(module); +- return 0; +- } +- +- if (find_kmod_module_from_sysfs_modalias(ctx, sysfs_node, strlen(sysfs_node), &list) >= 0) { +- kmod_list_foreach(l, list) { +- struct kmod_module *mod = kmod_module_get_module(l); +- char *module = strdup(kmod_module_get_name(mod)); +- kmod_module_unref(mod); +- +- if (hashmap_put(modules, module, module) < 0) +- free(module); +- } +- } +- +- return 0; +-} +- +-static void find_suppliers_for_sys_node(Hashmap *suppliers, const char *node_path_raw, +- size_t node_path_len) +-{ +- char node_path[PATH_MAX]; +- char real_path[PATH_MAX]; +- +- memcpy(node_path, node_path_raw, node_path_len); +- node_path[node_path_len] = '\0'; +- +- DIR *d; +- struct dirent *dir; +- while (realpath(node_path, real_path) != NULL && strcmp(real_path, "/sys/devices")) { +- d = opendir(node_path); +- if (d) { +- size_t real_path_len = strlen(real_path); +- while ((dir = readdir(d)) != NULL) { +- if (strstr(dir->d_name, "supplier:platform") != NULL) { +- if ((size_t)snprintf(real_path + real_path_len, sizeof(real_path) - real_path_len, "/%s/supplier", +- dir->d_name) < sizeof(real_path) - real_path_len) { +- char *real_supplier_path = realpath(real_path, NULL); +- if (real_supplier_path != NULL) +- if (hashmap_put(suppliers, real_supplier_path, real_supplier_path) < 0) +- free(real_supplier_path); +- } +- } +- } +- closedir(d); +- } +- strcat(node_path, "/.."); // Also find suppliers of parents +- } +-} +- +-static void find_suppliers(struct kmod_ctx *ctx) +-{ +- _cleanup_fts_close_ FTS *fts; +- char *paths[] = { "/sys/devices/platform", NULL }; +- fts = fts_open(paths, FTS_NOSTAT | FTS_PHYSICAL, NULL); +- +- for (FTSENT *ftsent = fts_read(fts); ftsent != NULL; ftsent = fts_read(fts)) { +- if (strcmp(ftsent->fts_name, "modalias") == 0) { +- _cleanup_kmod_module_unref_ struct kmod_module *drv = NULL; +- struct kmod_list *list = NULL; +- struct kmod_list *l; +- +- if (find_kmod_module_from_sysfs_driver(ctx, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen, &drv) >= 0) { +- const char *name = kmod_module_get_name(drv); +- Hashmap *suppliers = hashmap_get(modules_suppliers, name); +- if (suppliers == NULL) { +- suppliers = hashmap_new(string_hash_func, string_compare_func); +- hashmap_put(modules_suppliers, strdup(name), suppliers); +- } +- +- find_suppliers_for_sys_node(suppliers, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen); +- +- /* Skip modalias check */ +- continue; +- } +- +- if (find_kmod_module_from_sysfs_modalias(ctx, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen, &list) < 0) +- continue; +- +- kmod_list_foreach(l, list) { +- _cleanup_kmod_module_unref_ struct kmod_module *mod = kmod_module_get_module(l); +- const char *name = kmod_module_get_name(mod); +- Hashmap *suppliers = hashmap_get(modules_suppliers, name); +- if (suppliers == NULL) { +- suppliers = hashmap_new(string_hash_func, string_compare_func); +- hashmap_put(modules_suppliers, strdup(name), suppliers); +- } +- +- find_suppliers_for_sys_node(suppliers, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen); +- } +- } +- } +-} +- +-static Hashmap *find_suppliers_paths_for_module(const char *module) +-{ +- return hashmap_get(modules_suppliers, module); +-} +- +-static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mod, Hashmap *suppliers_paths, int *err) ++static int install_dependent_module(struct kmod_module *mod, int *err) + { + const char *path = NULL; + const char *name = NULL; +@@ -1762,13 +1602,13 @@ static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mo + log_debug("dracut_install '%s' '%s' OK", path, &path[kerneldirlen]); + install_firmware(mod); + modlist = kmod_module_get_dependencies(mod); +- *err = install_dependent_modules(ctx, modlist, suppliers_paths); ++ *err = install_dependent_modules(modlist); + if (*err == 0) { + *err = kmod_module_get_softdeps(mod, &modpre, &modpost); + if (*err == 0) { + int r; +- *err = install_dependent_modules(ctx, modpre, NULL); +- r = install_dependent_modules(ctx, modpost, NULL); ++ *err = install_dependent_modules(modpre); ++ r = install_dependent_modules(modpost); + *err = *err ? : r; + } + } +@@ -1786,7 +1626,7 @@ static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mo + return 0; + } + +-static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *modlist, Hashmap *suppliers_paths) ++static int install_dependent_modules(struct kmod_list *modlist) + { + struct kmod_list *itr = NULL; + int ret = 0; +@@ -1794,44 +1634,14 @@ static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *mod + kmod_list_foreach(itr, modlist) { + _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL; + mod = kmod_module_get_module(itr); +- if (install_dependent_module(ctx, mod, find_suppliers_paths_for_module(kmod_module_get_name(mod)), &ret)) ++ if (install_dependent_module(mod, &ret)) + return -1; + } + +- const char *supplier_path; +- Iterator i; +- HASHMAP_FOREACH(supplier_path, suppliers_paths, i) { +- if (check_hashmap(processed_suppliers, supplier_path)) +- continue; +- +- char *path = strdup(supplier_path); +- hashmap_put(processed_suppliers, path, path); +- +- _cleanup_destroy_hashmap_ Hashmap *modules = hashmap_new(string_hash_func, string_compare_func); +- find_modules_from_sysfs_node(ctx, supplier_path, modules); +- +- _cleanup_destroy_hashmap_ Hashmap *suppliers = hashmap_new(string_hash_func, string_compare_func); +- find_suppliers_for_sys_node(suppliers, supplier_path, strlen(supplier_path)); +- +- if (!hashmap_isempty(modules)) { // Supplier is a module +- const char *module; +- Iterator j; +- HASHMAP_FOREACH(module, modules, j) { +- _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL; +- if (!kmod_module_new_from_name(ctx, module, &mod)) { +- if (install_dependent_module(ctx, mod, suppliers, &ret)) +- return -1; +- } +- } +- } else { // Supplier is builtin +- install_dependent_modules(ctx, NULL, suppliers); +- } +- } +- + return ret; + } + +-static int install_module(struct kmod_ctx *ctx, struct kmod_module *mod) ++static int install_module(struct kmod_module *mod) + { + int ret = 0; + _cleanup_kmod_module_unref_list_ struct kmod_list *modlist = NULL; +@@ -1884,16 +1694,15 @@ static int install_module(struct kmod_ctx *ctx, struct kmod_module *mod) + } + install_firmware(mod); + +- Hashmap *suppliers = find_suppliers_paths_for_module(name); + modlist = kmod_module_get_dependencies(mod); +- ret = install_dependent_modules(ctx, modlist, suppliers); ++ ret = install_dependent_modules(modlist); + + if (ret == 0) { + ret = kmod_module_get_softdeps(mod, &modpre, &modpost); + if (ret == 0) { + int r; +- ret = install_dependent_modules(ctx, modpre, NULL); +- r = install_dependent_modules(ctx, modpost, NULL); ++ ret = install_dependent_modules(modpre); ++ r = install_dependent_modules(modpost); + ret = ret ? : r; + } + } +@@ -2012,9 +1821,6 @@ static int install_modules(int argc, char **argv) + if (p != NULL) + kerneldirlen = p - abskpath; + +- modules_suppliers = hashmap_new(string_hash_func, string_compare_func); +- find_suppliers(ctx); +- + if (arg_hostonly) { + char *modalias_file; + modalias_file = getenv("DRACUT_KERNEL_MODALIASES"); +@@ -2102,7 +1908,7 @@ static int install_modules(int argc, char **argv) + } + kmod_list_foreach(itr, modlist) { + mod = kmod_module_get_module(itr); +- r = install_module(ctx, mod); ++ r = install_module(mod); + kmod_module_unref(mod); + if ((r < 0) && !arg_optional) { + if (!arg_silent) +@@ -2181,7 +1987,7 @@ static int install_modules(int argc, char **argv) + } + kmod_list_foreach(itr, modlist) { + mod = kmod_module_get_module(itr); +- r = install_module(ctx, mod); ++ r = install_module(mod); + kmod_module_unref(mod); + if ((r < 0) && !arg_optional) { + if (!arg_silent) +@@ -2232,7 +2038,7 @@ static int install_modules(int argc, char **argv) + } + kmod_list_foreach(itr, modlist) { + mod = kmod_module_get_module(itr); +- r = install_module(ctx, mod); ++ r = install_module(mod); + kmod_module_unref(mod); + if ((r < 0) && !arg_optional) { + if (!arg_silent) +@@ -2333,10 +2139,8 @@ int main(int argc, char **argv) + + items = hashmap_new(string_hash_func, string_compare_func); + items_failed = hashmap_new(string_hash_func, string_compare_func); +- processed_suppliers = hashmap_new(string_hash_func, string_compare_func); +- modalias_to_kmod = hashmap_new(string_hash_func, string_compare_func); + +- if (!items || !items_failed || !processed_suppliers || !modules_loaded) { ++ if (!items || !items_failed || !modules_loaded) { + log_error("Out of memory"); + r = EXIT_FAILURE; + goto finish1; +@@ -2397,28 +2201,9 @@ finish2: + while ((i = hashmap_steal_first(items_failed))) + item_free(i); + +- Hashmap *h; +- while ((h = hashmap_steal_first(modules_suppliers))) { +- while ((i = hashmap_steal_first(h))) { +- item_free(i); +- } +- hashmap_free(h); +- } +- +- while ((i = hashmap_steal_first(processed_suppliers))) +- item_free(i); +- +- /* +- * Note: modalias_to_kmod's values are freed implicitly by the kmod context destruction +- * in kmod_unref(). +- */ +- + hashmap_free(items); + hashmap_free(items_failed); + hashmap_free(modules_loaded); +- hashmap_free(modules_suppliers); +- hashmap_free(processed_suppliers); +- hashmap_free(modalias_to_kmod); + + if (arg_mod_filter_path) + regfree(&mod_filter_path); +-- +2.46.0 + diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch deleted file mode 100644 index 377c0f3a898..00000000000 --- a/srcpkgs/dracut/patches/silence-setfont.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/void-linux/void-packages/issues/45216 - -I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath. - ---- - -diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh -index 3fe3b673..0e19ae30 100755 ---- a/modules.d/10i18n/console_init.sh -+++ b/modules.d/10i18n/console_init.sh -@@ -49,7 +49,7 @@ set_font() { - setfont "${FONT-${DEFAULT_FONT}}" \ - -C "${1}" \ - ${FONT_MAP:+-m "${FONT_MAP}"} \ -- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} -+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null - } - - dev_close() { diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 313e2d98719..c21b1a38a57 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut -version=059 -revision=7 +version=105 +revision=1 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf" @@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux" short_desc="Low-level tool for generating an initramfs/initrd image" maintainer="Zach Dykstra " license="GPL-2.0-or-later, LGPL-2.0-or-later" -homepage="https://github.com/dracutdevs/dracut/wiki" -changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md" -distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz" -checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf +homepage="https://github.com/dracut-ng/dracut-ng/wiki" +changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md" +distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz" +checksum=a5f94012873f589e2efc3659341f5e383ec90419f5c361a6fd3561f946133f69 alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm @@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) # archs supported by dracut for EFI bundle + i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle subpackages+=" dracut-uefi" ;; esac -pre_build() { - # Upstream tarball is missing version information - DRACUT_VERSION="${version}" make dracut-version.sh -} - post_install() { # kernel hooks. vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut @@ -52,23 +47,21 @@ post_install() { # systemd dependent additional dracut modules for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \ - 35connman 35network-manager 35network-wicked 80lvmmerge \ - 99memstrack 99squash; do + 35connman 35network-manager 80lvmmerge \ + 91fido2 91pcsc 91pkcs11 91tpm2-tss 95squash* \ + 99memstrack 99squash*; do rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f} done # don't need s390x architecture dependent dracut modules for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \ - 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \ - 95zfcp_rules 95znet; do + 95dcssblk 95zfcp 95znet; do rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f} done - # ifcfg network-scripts dependent (RHEL-derived) - rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg - rm ${DESTDIR}/usr/share/man/man8/*.service.* rm -r ${DESTDIR}/usr/lib/kernel + rm -r "${DESTDIR}"/usr/lib/dracut/test } dracut-network_package() { @@ -84,7 +77,7 @@ dracut-network_package() { } dracut-uefi_package() { - depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}" + depends="binutils systemd-boot-efistub ${sourcepkg}>=${version}_${revision}" short_desc+=" - UEFI bundle hook" conf_files="/etc/default/dracut-uefi-hook" diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template index bd1cb042ecd..6c22745e350 100644 --- a/srcpkgs/drumkv1/template +++ b/srcpkgs/drumkv1/template @@ -1,6 +1,6 @@ # Template file for 'drumkv1' pkgname=drumkv1 -version=1.1.2 +version=1.1.3 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-base" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://drumkv1.sourceforge.io/" changelog="https://github.com/rncbc/drumkv1/raw/main/ChangeLog" distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz" -checksum=a6a0c1971be39131f9c44b838b796de355863abd478b1a2293fdf616c92a5678 +checksum=0c15ecb3b9b44810fd8ca90d58523eb01d392b0c4060648a328a3ea7c9447891 diff --git a/srcpkgs/dtc/template b/srcpkgs/dtc/template index fcac6726633..91ea70a9adb 100644 --- a/srcpkgs/dtc/template +++ b/srcpkgs/dtc/template @@ -1,6 +1,6 @@ # Template file for 'dtc' pkgname=dtc -version=1.7.1 +version=1.7.2 revision=1 build_style=gnu-makefile make_build_args="NO_PYTHON=1" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-only" homepage="https://git.kernel.org/pub/scm/utils/dtc/dtc.git" distfiles="https://www.kernel.org/pub/software/utils/dtc/dtc-${version}.tar.xz" -checksum=398098bac205022b39d3dce5982b98c57f1023f3721a53ebcbb782be4cf7885e +checksum=92d8ca769805ae1f176204230438fe52808f4e1c7944053c9eec0e649b237539 CFLAGS="-fPIC" diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template index a25074d216c..11b622cdbee 100644 --- a/srcpkgs/dua-cli/template +++ b/srcpkgs/dua-cli/template @@ -1,6 +1,6 @@ # Template file for 'dua-cli' pkgname=dua-cli -version=2.29.2 +version=2.29.4 revision=1 build_style=cargo short_desc="Tool to conveniently learn about the disk usage of directories" @@ -9,7 +9,7 @@ license="MIT" homepage="https://github.com/Byron/dua-cli" changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md" distfiles="https://github.com/Byron/dua-cli/archive/refs/tags/v${version}.tar.gz" -checksum=76ebd07c4a4379ef0d45232fa7a9b0bcbff1bd54fad6930ec1a2823806473f5d +checksum=b63c4cd9cf7ffa369f621cf798944374cef59b6cdb0fc8d608e2192bc9085951 post_install() { vlicense LICENSE diff --git a/srcpkgs/duckdb/template b/srcpkgs/duckdb/template index da820b5dd1b..b72ae8fe584 100644 --- a/srcpkgs/duckdb/template +++ b/srcpkgs/duckdb/template @@ -1,6 +1,6 @@ # Template file for 'duckdb' pkgname=duckdb -version=1.1.1 +version=1.1.3 revision=1 archs="x86_64* aarch64*" # 32-bit FTBFS build_style=cmake @@ -16,7 +16,7 @@ license="MIT" homepage="https://duckdb.org" changelog="https://github.com/duckdb/duckdb/releases" distfiles="https://github.com/duckdb/duckdb/archive/refs/tags/v${version}.tar.gz" -checksum=a764cef80287ccfd8555884d8facbe962154e7c747043c0842cd07873b4d6752 +checksum=2aea0af898ad753fee82b776fea1bf78ccbc9648986e7f7a87372df5e74cdb98 case "${XBPS_TARGET_MACHINE}" in x86_64*) configure_args+=" -DDUCKDB_EXPLICIT_PLATFORM=linux_amd64" ;; diff --git a/srcpkgs/dufs/template b/srcpkgs/dufs/template index 67a02ab5a8d..1495b2b3d36 100644 --- a/srcpkgs/dufs/template +++ b/srcpkgs/dufs/template @@ -1,6 +1,6 @@ # Template file for 'dufs' pkgname=dufs -version=0.42.0 +version=0.43.0 revision=1 build_style=cargo build_helper=qemu @@ -14,7 +14,7 @@ license="Apache-2.0, MIT" homepage="https://github.com/sigoden/dufs" changelog="https://raw.githubusercontent.com/sigoden/dufs/main/CHANGELOG.md" distfiles="https://github.com/sigoden/dufs/archive/v${version}.tar.gz" -checksum=76439a01c142d6a378912930de4b74821aa2fef54ccfb7dbb00d6ea3b1a0ab4c +checksum=4ba3b90486336efc4e592bcf15f14d4e3b6ac7b3b1bf8770815b8c43975d8b01 post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template index 99cdda91d35..b88b514057d 100644 --- a/srcpkgs/dune/template +++ b/srcpkgs/dune/template @@ -1,6 +1,6 @@ # Template file for 'dune' pkgname=dune -version=3.16.0 +version=3.16.1 revision=1 makedepends="ocaml" depends="ocaml" @@ -10,7 +10,7 @@ license="MIT" homepage="https://dune.build/" changelog="https://raw.githubusercontent.com/ocaml/dune/main/CHANGES.md" distfiles="https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz" -checksum=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6 +checksum=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de nocross="ocaml" _dune_release_pkgs="dune dune-build-info dune-configurator diff --git a/srcpkgs/e16/template b/srcpkgs/e16/template index 93651fd6873..57168c945bf 100644 --- a/srcpkgs/e16/template +++ b/srcpkgs/e16/template @@ -1,17 +1,17 @@ # Template file for 'e16' pkgname=e16 -version=1.0.29 +version=1.0.30 revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc --enable-sound=alsa" hostmakedepends="pkg-config tar" -makedepends="pango-devel libXinerama-devel libXrandr-devel imlib2-devel libXcomposite-devel libXdamage-devel alsa-lib-devel libsndfile-devel" +makedepends="pango-devel libXinerama-devel libXrandr-devel imlib2-devel libXcomposite-devel libXdamage-devel alsa-lib-devel libsndfile-devel libXft-devel" short_desc="Enlightenment DR16 window manager" maintainer="Brihadeesh " license="BSD-2-Clause" homepage="https://www.enlightenment.org/e16" distfiles="$SOURCEFORGE_SITE/enlightenment/${pkgname}-${version}.tar.gz" -checksum=608e1405dc8d0c9aca7fc3d0ff6a7258ac94f3c5166e56d0316646d3c7df2289 +checksum=b8b7748a2c48c4c7c9758d9ad12b14f566d2bec38f2eda533e6d874f5ce9074c post_install() { # install gnome and kde session scripts diff --git a/srcpkgs/edk2-ovmf/template b/srcpkgs/edk2-ovmf/template index f216a7d665b..040e0ffc606 100644 --- a/srcpkgs/edk2-ovmf/template +++ b/srcpkgs/edk2-ovmf/template @@ -1,6 +1,6 @@ # Template file for 'edk2-ovmf' pkgname=edk2-ovmf -version=202408 +version=202408.01 revision=1 _mipi_ver=370b5944c046bab043dd8b133727b2135af7747a _openssl_ver=3.0.9 @@ -22,7 +22,7 @@ distfiles="https://github.com/tianocore/edk2/archive/refs/tags/edk2-stable${vers https://github.com/ucb-bar/berkeley-softfloat-3/archive/${_softfloat_ver}.tar.gz>softfloat-${_softfloat_ver}.tar.gz https://github.com/DMTF/libspdm/archive/refs/tags/${_spdm_ver}.tar.gz>libspdm-${_spdm_ver}.tar.gz https://github.com/devicetree-org/pylibfdt/archive/${_fdt_ver}.tar.gz>libfdt-${_fdt_ver}.tar.gz" -checksum="63c99b6f9f7aa94e8d76c432bea05d0d4dd6600af78d6fd59a1aec5ce9cea8ce +checksum="3ea3988f885d9ca28b255111646440eb31491dc6d3f556b770e7ac90099755e0 9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90 b5c7e7c54e013c168f4aae036e59912785f11b4aeebd57f6165a14e879b9a82c diff --git a/srcpkgs/electron33-devel b/srcpkgs/electron33-devel new file mode 120000 index 00000000000..71594bd333d --- /dev/null +++ b/srcpkgs/electron33-devel @@ -0,0 +1 @@ +electron33 \ No newline at end of file diff --git a/srcpkgs/electron33/files/musl-patches/chromium-libc++-musl.patch b/srcpkgs/electron33/files/musl-patches/chromium-libc++-musl.patch new file mode 100644 index 00000000000..b90a54daa8b --- /dev/null +++ b/srcpkgs/electron33/files/musl-patches/chromium-libc++-musl.patch @@ -0,0 +1,12 @@ +Source: https://git.alpinelinux.org/aports/tree/community/chromium/yes-musl.patch +--- ./buildtools/third_party/libc++/__config_site.orig ++++ ./buildtools/third_party/libc++/__config_site +@@ -18,7 +18,7 @@ + /* #undef _LIBCPP_ABI_FORCE_MICROSOFT */ + /* #undef _LIBCPP_HAS_NO_THREADS */ + /* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */ +-/* #undef _LIBCPP_HAS_MUSL_LIBC */ ++#define _LIBCPP_HAS_MUSL_LIBC 1 + /* #undef _LIBCPP_HAS_THREAD_API_PTHREAD */ + /* #undef _LIBCPP_HAS_THREAD_API_EXTERNAL */ + /* #undef _LIBCPP_HAS_THREAD_API_WIN32 */ diff --git a/srcpkgs/electron33/files/musl-patches/chromium-musl-no-mallinfo.patch b/srcpkgs/electron33/files/musl-patches/chromium-musl-no-mallinfo.patch new file mode 100644 index 00000000000..225fd0d35a6 --- /dev/null +++ b/srcpkgs/electron33/files/musl-patches/chromium-musl-no-mallinfo.patch @@ -0,0 +1,106 @@ +musl does not implement mallinfo()/mallinfo2() +(or rather, malloc-ng, musl's allocator, doesn't) + +for some reason only outside of x86_64 HAVE_MALLINFO gets weirdly set by something +-- +--- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc ++++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc +@@ -646,7 +645,7 @@ SHIM_ALWAYS_EXPORT int mallopt(int cmd, int value) __THROW { + + #endif // !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_ANDROID) + +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if 0 + SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW { + partition_alloc::SimplePartitionStatsDumper allocator_dumper; + Allocator()->DumpStats("malloc", true, &allocator_dumper); +--- a/base/process/process_metrics_posix.cc ++++ b/base/process/process_metrics_posix.cc +@@ -106,7 +107,8 @@ void IncreaseFdLimitTo(unsigned int max_descriptors) { + + #endif // !BUILDFLAG(IS_FUCHSIA) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || \ ++ BUILDFLAG(IS_ANDROID) + namespace { + + size_t GetMallocUsageMallinfo() { +@@ -132,7 +134,8 @@ size_t ProcessMetrics::GetMallocUsage() { + malloc_statistics_t stats = {0}; + malloc_zone_statistics(nullptr, &stats); + return stats.size_in_use; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || \ ++ BUILDFLAG(IS_ANDROID) + return GetMallocUsageMallinfo(); + #elif BUILDFLAG(IS_FUCHSIA) + // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. +diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc +index e37fc69c00..394f5dfdbb 100644 +--- a/base/trace_event/malloc_dump_provider.cc ++++ b/base/trace_event/malloc_dump_provider.cc +@@ -189,7 +188,6 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, + #define MALLINFO2_FOUND_IN_LIBC + struct mallinfo2 info = mallinfo2(); + #endif +-#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ) + #if !defined(MALLINFO2_FOUND_IN_LIBC) + struct mallinfo info = mallinfo(); + #endif +@@ -211,6 +209,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, + MemoryAllocatorDump::kUnitsBytes, + total_allocated_size); + } ++#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ) + } + #endif + +@@ -368,7 +367,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + &allocated_objects_count); + #elif BUILDFLAG(IS_FUCHSIA) + // TODO(fuchsia): Port, see https://crbug.com/706592. +-#else ++#elif defined(__GLIBC__) + ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size, + &allocated_objects_size, &allocated_objects_count); + #endif +diff --git a/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc b/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc +index 9a4428ec45..07defd5ded 100644 +--- a/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc ++++ b/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc +@@ -43,7 +43,7 @@ MemoryUsage GetMemoryUsage() { + if (getrusage(RUSAGE_SELF, &res) == 0) { + result.mem_footprint_kb = res.ru_maxrss; + } +-#if defined(__NO_MALLINFO__) ++#if 1 + result.total_allocated_bytes = -1; + result.in_use_allocated_bytes = -1; + #elif defined(__GLIBC__) && __GLIBC_MINOR__ >= 33 +--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h ++++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h +@@ -133,7 +133,6 @@ + /* #undef HAVE_MALLCTL */ + + /* Define to 1 if you have the `mallinfo' function. */ +-#define HAVE_MALLINFO 1 + + /* Some projects using SwiftShader bypass cmake (eg Chromium via gn) */ + /* so we need to check glibc version for the new API to be safe */ +--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Process.inc ++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Process.inc +@@ -83,11 +83,11 @@ Expected Process::getPageSize() { + } + + size_t Process::GetMallocUsage() { +-#if defined(HAVE_MALLINFO2) ++#if 0 + struct mallinfo2 mi; + mi = ::mallinfo2(); + return mi.uordblks; +-#elif defined(HAVE_MALLINFO) ++#elif 0 + struct mallinfo mi; + mi = ::mallinfo(); + return mi.uordblks; diff --git a/srcpkgs/electron33/files/musl-patches/chromium-musl-sandbox.patch b/srcpkgs/electron33/files/musl-patches/chromium-musl-sandbox.patch new file mode 100644 index 00000000000..7d886cec2ed --- /dev/null +++ b/srcpkgs/electron33/files/musl-patches/chromium-musl-sandbox.patch @@ -0,0 +1,126 @@ +Source: https://git.alpinelinux.org/aports/tree/community/chromium/musl-sandbox.patch +musl uses different syscalls from glibc for some functions, so the sandbox has +to account for that +-- +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +index ff5a1c0..da56b9b 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +@@ -139,21 +139,11 @@ namespace sandbox { + // present (as in newer versions of posix_spawn). + ResultExpr RestrictCloneToThreadsAndEPERMFork() { + const Arg flags(0); +- +- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2. +- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES | +- CLONE_SIGHAND | CLONE_THREAD | +- CLONE_SYSVSEM; +- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED; +- +- const uint64_t kGlibcPthreadFlags = +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | +- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID; +- const BoolExpr glibc_test = flags == kGlibcPthreadFlags; +- +- const BoolExpr android_test = +- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, +- flags == kGlibcPthreadFlags); ++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_THREAD | CLONE_SYSVSEM; ++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | ++ CLONE_DETACHED; ++ const BoolExpr thread_clone_ok = (flags&~safe)==required; + + // The following two flags are the two important flags in any vfork-emulating + // clone call. EPERM any clone call that contains both of them. +@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() { + AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0, + (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags); + +- return If(IsAndroid() ? android_test : glibc_test, Allow()) ++ return If(thread_clone_ok, Allow()) + .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) + .Else(CrashSIGSYSClone()); + } +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +index d9d1882..0567557 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + #if defined(__i386__) + case __NR_waitpid: + #endif ++ case __NR_set_tid_address: + return true; + case __NR_clone: // Should be parameter-restricted. + case __NR_setns: // Privileged. +@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) + case __NR_set_thread_area: + #endif +- case __NR_set_tid_address: + case __NR_unshare: + #if !defined(__mips__) && !defined(__aarch64__) + case __NR_vfork: +@@ -550,6 +550,8 @@ + case __NR_munlock: + case __NR_munmap: + case __NR_mseal: ++ case __NR_mremap: ++ case __NR_membarrier: + return true; + case __NR_madvise: + case __NR_mincore: +@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { + case __NR_modify_ldt: + #endif + case __NR_mprotect: +- case __NR_mremap: + case __NR_msync: + case __NR_munlockall: + case __NR_readahead: +diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h +index 2b78a0c..b6fedb5 100644 +--- a/sandbox/linux/system_headers/linux_syscalls.h ++++ b/sandbox/linux/system_headers/linux_syscalls.h +@@ -10,6 +10,7 @@ + #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ + + #include "build/build_config.h" ++#include + + #if defined(__x86_64__) + #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h" +--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc +@@ -94,6 +94,10 @@ + case __NR_pwrite64: ++ case __NR_pwritev2: + case __NR_sched_get_priority_max: + case __NR_sched_get_priority_min: ++ case __NR_sched_getparam: ++ case __NR_sched_getscheduler: ++ case __NR_sched_setscheduler: + case __NR_sysinfo: + case __NR_times: + case __NR_uname: +--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +@@ -225,10 +225,15 @@ + if (sysno == __NR_getpriority || sysno ==__NR_setpriority) + return RestrictGetSetpriority(current_pid); + ++ // XXX: hacks for musl sandbox, calls needed? ++ if (sysno == __NR_sched_getparam || sysno == __NR_sched_getscheduler || ++ sysno == __NR_sched_setscheduler) { ++ return Allow(); ++ } ++ + // The scheduling syscalls are used in threading libraries and also heavily in + // abseil. See for example https://crbug.com/1370394. +- if (sysno == __NR_sched_getaffinity || sysno == __NR_sched_getparam || +- sysno == __NR_sched_getscheduler || sysno == __NR_sched_setscheduler) { ++ if (sysno == __NR_sched_getaffinity) { + return RestrictSchedTarget(current_pid, sysno); + } + diff --git a/srcpkgs/electron33/files/musl-patches/chromium-musl-tid-caching.patch b/srcpkgs/electron33/files/musl-patches/chromium-musl-tid-caching.patch new file mode 100644 index 00000000000..52bbe775ad2 --- /dev/null +++ b/srcpkgs/electron33/files/musl-patches/chromium-musl-tid-caching.patch @@ -0,0 +1,86 @@ +Source: https://git.alpinelinux.org/aports/plain/community/chromium/musl-tid-caching.patch +the sandbox caching of thread id's only works with glibc +see: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/32356 +see: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13579 +-- +--- a/sandbox/linux/services/namespace_sandbox.cc ++++ b/sandbox/linux/services/namespace_sandbox.cc +@@ -209,6 +209,70 @@ + return base::LaunchProcess(argv, launch_options_copy); + } + ++#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__) ++#define TLS_ABOVE_TP ++#endif ++ ++struct musl_pthread ++{ ++ /* Part 1 -- these fields may be external or ++ * internal (accessed via asm) ABI. Do not change. */ ++ struct pthread *self; ++#ifndef TLS_ABOVE_TP ++ uintptr_t *dtv; ++#endif ++ struct pthread *prev, *next; /* non-ABI */ ++ uintptr_t sysinfo; ++#ifndef TLS_ABOVE_TP ++#ifdef CANARY_PAD ++ uintptr_t canary_pad; ++#endif ++ uintptr_t canary; ++#endif ++ ++/* Part 2 -- implementation details, non-ABI. */ ++ int tid; ++ int errno_val; ++ volatile int detach_state; ++ volatile int cancel; ++ volatile unsigned char canceldisable, cancelasync; ++ unsigned char tsd_used:1; ++ unsigned char dlerror_flag:1; ++ unsigned char *map_base; ++ size_t map_size; ++ void *stack; ++ size_t stack_size; ++ size_t guard_size; ++ void *result; ++ struct __ptcb *cancelbuf; ++ void **tsd; ++ struct { ++ volatile void *volatile head; ++ long off; ++ volatile void *volatile pending; ++ } robust_list; ++ int h_errno_val; ++ volatile int timer_id; ++ locale_t locale; ++ volatile int killlock[1]; ++ char *dlerror_buf; ++ void *stdio_locks; ++ ++ /* Part 3 -- the positions of these fields relative to ++ * the end of the structure is external and internal ABI. */ ++#ifdef TLS_ABOVE_TP ++ uintptr_t canary; ++ uintptr_t *dtv; ++#endif ++}; ++ ++void MaybeUpdateMuslTidCache() ++{ ++ pid_t real_tid = sys_gettid(); ++ pid_t* cached_tid_location = &reinterpret_cast(pthread_self())->tid; ++ *cached_tid_location = real_tid; ++} ++ + // static + pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) { + const pid_t pid = +@@ -226,6 +290,7 @@ + #if defined(LIBC_GLIBC) + MaybeUpdateGlibcTidCache(); + #endif ++ MaybeUpdateMuslTidCache(); + return 0; + } + diff --git a/srcpkgs/electron33/files/musl-patches/chromium-no-res-ninit-nclose.patch b/srcpkgs/electron33/files/musl-patches/chromium-no-res-ninit-nclose.patch new file mode 100644 index 00000000000..6884039efb8 --- /dev/null +++ b/srcpkgs/electron33/files/musl-patches/chromium-no-res-ninit-nclose.patch @@ -0,0 +1,33 @@ +Source: https://git.alpinelinux.org/aports/plain/community/chromium/no-res-ninit-nclose.patch +similar to dns-resolver.patch, musl doesn't have res_ninit and so on +-- +--- a/net/dns/public/scoped_res_state.cc ++++ b/net/dns/public/scoped_res_state.cc +@@ -13,7 +13,7 @@ + namespace net { + + ScopedResState::ScopedResState() { +-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE) + // Note: res_ninit in glibc always returns 0 and sets RES_INIT. + // res_init behaves the same way. + memset(&_res, 0, sizeof(_res)); +@@ -25,16 +25,8 @@ + } + + ScopedResState::~ScopedResState() { +-#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) +- +- // Prefer res_ndestroy where available. +-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD) +- res_ndestroy(&res_); +-#else +- res_nclose(&res_); +-#endif // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD) +- +-#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) ++ // musl res_init() doesn't actually do anything ++ // no destruction is necessary as no memory has been allocated + } + + bool ScopedResState::IsValid() const { diff --git a/srcpkgs/electron33/files/musl-patches/chromium-no-sandbox-settls.patch b/srcpkgs/electron33/files/musl-patches/chromium-no-sandbox-settls.patch new file mode 100644 index 00000000000..02b3b4c49c8 --- /dev/null +++ b/srcpkgs/electron33/files/musl-patches/chromium-no-sandbox-settls.patch @@ -0,0 +1,14 @@ +this optimisation of CLONE_SETTLS is not valid used like this, and future musl +clone(3) will EINVAL on this use +-- +--- a/sandbox/linux/services/credentials.cc ++++ b/sandbox/linux/services/credentials.cc +@@ -89,7 +89,7 @@ + + int clone_flags = CLONE_FS | LINUX_SIGCHLD; + void* tls = nullptr; +-#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \ ++#if 0 && (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \ + !defined(MEMORY_SANITIZER) + // Use CLONE_VM | CLONE_VFORK as an optimization to avoid copying page tables. + // Since clone writes to the new child's TLS before returning, we must set a diff --git a/srcpkgs/electron33/files/patches/chromium-angle-wayland-include.patch b/srcpkgs/electron33/files/patches/chromium-angle-wayland-include.patch new file mode 100644 index 00000000000..65770b9439c --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-angle-wayland-include.patch @@ -0,0 +1,39 @@ +Patch-Source: https://github.com/archlinux/svntogit-packages/blob/a353833a5a731abfaa465b658f61894a516aa49b/trunk/angle-wayland-include-protocol.patch +diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn +--- a/third_party/angle.orig/BUILD.gn 2022-08-17 19:38:11.000000000 +0000 ++++ b/third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000 +@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") { + if (angle_enable_vulkan && angle_use_wayland && + defined(vulkan_wayland_include_dirs)) { + include_dirs = vulkan_wayland_include_dirs ++ } else if (angle_enable_vulkan && angle_use_wayland) { ++ include_dirs = [ ++ "$wayland_gn_dir/src/src", ++ "$wayland_gn_dir/include/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } + +@@ -1073,6 +1079,7 @@ if (angle_use_wayland) { + include_dirs = [ + "$wayland_dir/egl", + "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", + ] + } + +diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn +--- a/third_party/angle.orig/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000 ++++ b/third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000 +@@ -21,6 +21,9 @@ source_set("volk") { + configs += [ "$angle_root:angle_no_cfi_icall" ] + public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] + if (angle_use_wayland) { +- include_dirs = [ "$wayland_dir/src" ] ++ include_dirs = [ ++ "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } diff --git a/srcpkgs/electron33/files/patches/chromium-browser-size_t.patch b/srcpkgs/electron33/files/patches/chromium-browser-size_t.patch new file mode 100644 index 00000000000..36af0ec6c4a --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-browser-size_t.patch @@ -0,0 +1,10 @@ +--- a/chrome/browser/search/background/ntp_backgrounds.h 2020-08-10 20:39:20.000000000 +0200 ++++ b/chrome/browser/search/background/ntp_backgrounds.h 2020-09-04 13:48:22.640023256 +0200 +@@ -6,6 +6,7 @@ + #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_ + + #include ++#include + + class GURL; + diff --git a/srcpkgs/electron33/files/patches/chromium-build-support-musl.patch b/srcpkgs/electron33/files/patches/chromium-build-support-musl.patch new file mode 100644 index 00000000000..1e5b0b8afae --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-build-support-musl.patch @@ -0,0 +1,78 @@ +--- a/build/toolchain/toolchain.gni ++++ b/build/toolchain/toolchain.gni +@@ -51,6 +51,10 @@ + } + } + ++declare_args() { ++ is_musl = false ++} ++ + # Extension for shared library files (including leading dot). + if (is_apple) { + shlib_extension = ".dylib" +--- a/build/config/rust.gni ++++ b/build/config/rust.gni +@@ -185,11 +185,23 @@ + rust_abi_target = "" + if (is_linux || is_chromeos) { + if (current_cpu == "arm64") { +- 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") diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-115-compiler-SkColor4f.patch b/srcpkgs/electron33/files/patches/chromium-chromium-115-compiler-SkColor4f.patch new file mode 100644 index 00000000000..ffa0e7ed108 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-115-compiler-SkColor4f.patch @@ -0,0 +1,27 @@ +Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-compiler-SkColor4f.patch +diff -up chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc +--- chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me 2023-06-24 10:38:11.011511463 +0200 ++++ chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc 2023-06-24 13:07:35.865375884 +0200 +@@ -84,6 +84,7 @@ CanvasStyle::CanvasStyle(const CanvasSty + + void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, + float global_alpha) const { ++ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha}; + switch (type_) { + case kColor: + ApplyColorToFlags(flags, global_alpha); +@@ -91,12 +92,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint + case kGradient: + GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(), + ImageDrawOptions()); +- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); ++ flags.setColor(custom_color); + break; + case kImagePattern: + GetCanvasPattern()->GetPattern()->ApplyToFlags( + flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform())); +- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); ++ flags.setColor(custom_color); + break; + default: + NOTREACHED(); diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-117-string-convert.patch b/srcpkgs/electron33/files/patches/chromium-chromium-117-string-convert.patch new file mode 100644 index 00000000000..cb48e4b21a6 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-117-string-convert.patch @@ -0,0 +1,21 @@ +diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc +diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me chromium-117.0.5938.62/net/dns/host_resolver_cache.h +--- chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me 2023-09-14 15:21:24.632965004 +0200 ++++ chromium-117.0.5938.62/net/dns/host_resolver_cache.h 2023-09-15 09:15:48.511300845 +0200 +@@ -143,12 +143,14 @@ class NET_EXPORT HostResolverCache final + } + + bool operator()(const Key& lhs, const KeyRef& rhs) const { ++ const std::string rhs_domain_name{rhs.domain_name}; + return std::tie(lhs.domain_name, lhs.network_anonymization_key) < +- std::tie(rhs.domain_name, *rhs.network_anonymization_key); ++ std::tie(rhs_domain_name, *rhs.network_anonymization_key); + } + + bool operator()(const KeyRef& lhs, const Key& rhs) const { +- return std::tie(lhs.domain_name, *lhs.network_anonymization_key) < ++ const std::string lhs_domain_name{lhs.domain_name}; ++ return std::tie(lhs_domain_name, *lhs.network_anonymization_key) < + std::tie(rhs.domain_name, rhs.network_anonymization_key); + } + }; diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-119-assert.patch b/srcpkgs/electron33/files/patches/chromium-chromium-119-assert.patch new file mode 100644 index 00000000000..6c502f13a59 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-119-assert.patch @@ -0,0 +1,12 @@ +diff -up chromium-119.0.6045.59/v8/src/base/small-vector.h.than chromium-119.0.6045.59/v8/src/base/small-vector.h +--- chromium-119.0.6045.59/v8/src/base/small-vector.h.than 2023-11-01 16:13:12.645301345 +0100 ++++ chromium-119.0.6045.59/v8/src/base/small-vector.h 2023-11-01 16:13:29.660610182 +0100 +@@ -22,7 +22,7 @@ template ::value); + + public: diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-119-fix-aarch64-musl.patch b/srcpkgs/electron33/files/patches/chromium-chromium-119-fix-aarch64-musl.patch new file mode 100644 index 00000000000..cbb2ec14c90 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-119-fix-aarch64-musl.patch @@ -0,0 +1,11 @@ +--- a/v8/src/base/cpu.cc ++++ b/v8/src/base/cpu.cc +@@ -14,7 +14,7 @@ + #if V8_OS_LINUX + #include // AT_HWCAP + #endif +-#if V8_GLIBC_PREREQ(2, 16) || V8_OS_ANDROID ++#if V8_OS_LINUX || V8_OS_ANDROID + #include // getauxval() + #endif + #if V8_OS_QNX diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-121-rust-clang_lib.patch b/srcpkgs/electron33/files/patches/chromium-chromium-121-rust-clang_lib.patch new file mode 100644 index 00000000000..4014f9a8276 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-121-rust-clang_lib.patch @@ -0,0 +1,22 @@ +--- a/build/config/clang/BUILD.gn ++++ b/build/config/clang/BUILD.gn +@@ -128,14 +128,15 @@ + } else if (is_apple) { + _dir = "darwin" + } else if (is_linux || is_chromeos) { ++ _dir = "linux" + if (current_cpu == "x64") { +- _dir = "x86_64-unknown-linux-gnu" ++ _suffix = "-x86_64" + } else if (current_cpu == "x86") { +- _dir = "i386-unknown-linux-gnu" ++ _suffix = "-i386" + } else if (current_cpu == "arm") { +- _dir = "armv7-unknown-linux-gnueabihf" ++ _suffix = "-armhf" + } else if (current_cpu == "arm64") { +- _dir = "aarch64-unknown-linux-gnu" ++ _suffix = "-aarch64" + } else { + assert(false) # Unhandled cpu type + } diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-121-rust-without-profiler_builtins.patch b/srcpkgs/electron33/files/patches/chromium-chromium-121-rust-without-profiler_builtins.patch new file mode 100644 index 00000000000..25c34229829 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-121-rust-without-profiler_builtins.patch @@ -0,0 +1,10 @@ +--- a/build/rust/std/BUILD.gn ++++ b/build/rust/std/BUILD.gn +@@ -100,7 +100,6 @@ + # don't need to pass to the C++ linker because they're used for specialized + # purposes. + skip_stdlib_files = [ +- "profiler_builtins", + "rustc_std_workspace_alloc", + "rustc_std_workspace_core", + "rustc_std_workspace_std", diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-124-iwyu-sys-select-dawn-terminal.patch b/srcpkgs/electron33/files/patches/chromium-chromium-124-iwyu-sys-select-dawn-terminal.patch new file mode 100644 index 00000000000..cc7299aafff --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-124-iwyu-sys-select-dawn-terminal.patch @@ -0,0 +1,24 @@ +From cf993f56ce699ca0ed66ca5a6b88fe7b31c03a75 Mon Sep 17 00:00:00 2001 +From: "lauren n. liberda" +Date: Fri, 5 Apr 2024 06:08:21 +0200 +Subject: [PATCH] iwyu: sys/select.h in terminal utils + +required for fd_set. fixes building on musl libc + +Change-Id: I5c03d58c8337c1af871024a436b09117ad9206d4 +--- + src/tint/utils/system/terminal_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/dawn/src/tint/utils/system/terminal_posix.cc b/third_party/dawn/src/tint/utils/system/terminal_posix.cc +index e820774244..a97eab7db8 100644 +--- a/third_party/dawn/src/tint/utils/system/terminal_posix.cc ++++ b/third_party/dawn/src/tint/utils/system/terminal_posix.cc +@@ -27,6 +27,7 @@ + + // GEN_BUILD:CONDITION(tint_build_is_linux || tint_build_is_mac) + ++#include + #include + + #include diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-125-disable-FFmpegAllowLists.patch b/srcpkgs/electron33/files/patches/chromium-chromium-125-disable-FFmpegAllowLists.patch new file mode 100644 index 00000000000..e03688cdcbb --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-125-disable-FFmpegAllowLists.patch @@ -0,0 +1,12 @@ +diff -up chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists chromium-125.0.6422.41/media/base/media_switches.cc +--- chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists 2024-05-12 21:28:43.694027396 +0200 ++++ chromium-125.0.6422.41/media/base/media_switches.cc 2024-05-12 21:32:48.155063623 +0200 +@@ -1753,7 +1753,7 @@ BASE_FEATURE(kUseWindowBoundsForPip, + // Enables FFmpeg allow lists for supported codecs / containers. + BASE_FEATURE(kFFmpegAllowLists, + "FFmpegAllowLists", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ base::FEATURE_DISABLED_BY_DEFAULT); + + #if BUILDFLAG(IS_WIN) + // Enables audio offload when supported by endpoints. diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-126-split-threshold-for-reg-with-hint.patch b/srcpkgs/electron33/files/patches/chromium-chromium-126-split-threshold-for-reg-with-hint.patch new file mode 100644 index 00000000000..4ae1f29a867 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-126-split-threshold-for-reg-with-hint.patch @@ -0,0 +1,28 @@ +diff -up chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me chromium-126.0.6478.26/build/config/compiler/BUILD.gn +--- chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me 2024-06-02 14:02:52.516602574 +0200 ++++ chromium-126.0.6478.26/build/config/compiler/BUILD.gn 2024-06-02 14:17:24.527503540 +0200 +@@ -575,24 +575,6 @@ config("compiler") { + } + } + +- # TODO(crbug.com/40283598): This causes binary size growth and potentially +- # other problems. +- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version. +- if (default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline) { +- cflags += [ +- "-mllvm", +- "-split-threshold-for-reg-with-hint=0", +- ] +- if (use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] +- } +- } +- } +- + # TODO(crbug.com/40192287): Investigate why/if this should be needed. + if (is_win) { + cflags += [ "/clang:-ffp-contract=off" ] diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-revert-drop-of-system-java.patch b/srcpkgs/electron33/files/patches/chromium-chromium-revert-drop-of-system-java.patch new file mode 100644 index 00000000000..117a50f8e4f --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-revert-drop-of-system-java.patch @@ -0,0 +1,15 @@ +This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef +--- a/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200 ++++ b/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200 +@@ -13,8 +13,9 @@ + + + _CURRENT_DIR = os.path.join(os.path.dirname(__file__)) +-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") +-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds" ++_JAVA_BIN = "java" ++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") ++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN + + class Compiler(object): + """Runs the Closure compiler on given source files to typecheck them diff --git a/srcpkgs/electron33/files/patches/chromium-chromium-system-nodejs.patch b/srcpkgs/electron33/files/patches/chromium-chromium-system-nodejs.patch new file mode 100644 index 00000000000..78c3e965c16 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-chromium-system-nodejs.patch @@ -0,0 +1,21 @@ +--- a/third_party/node/node.py ++++ b/third_party/node/node.py +@@ -11,17 +11,7 @@ + + + def GetBinaryPath(): +- if platform.machine() == 'arm64': +- darwin_path = 'mac_arm64' +- darwin_name = 'node-darwin-arm64' +- else: +- darwin_path = 'mac' +- darwin_name = 'node-darwin-x64' +- return os_path.join(os_path.dirname(__file__), *{ +- 'Darwin': (darwin_path, darwin_name, 'bin', 'node'), +- 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), +- 'Windows': ('win', 'node.exe'), +- }[platform.system()]) ++ return "/usr/bin/node" + + + def RunNode(cmd_parts, stdout=None): diff --git a/srcpkgs/electron33/files/patches/chromium-cross-build.patch b/srcpkgs/electron33/files/patches/chromium-cross-build.patch new file mode 100644 index 00000000000..59e1bff61f3 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-cross-build.patch @@ -0,0 +1,54 @@ +--- a/build/config/compiler/BUILD.gn.orig ++++ b/build/config/compiler/BUILD.gn +@@ -917,8 +917,13 @@ + } else if (current_cpu == "arm64") { + if (is_clang && !is_android && !is_nacl && !is_fuchsia && + !(is_chromeos_lacros && is_chromeos_device)) { +- cflags += [ "--target=aarch64-linux-gnu" ] +- ldflags += [ "--target=aarch64-linux-gnu" ] ++ if (is_musl) { ++ cflags += [ "--target=aarch64-linux-musl" ] ++ ldflags += [ "--target=aarch64-linux-musl" ] ++ } else { ++ cflags += [ "--target=aarch64-linux-gnu" ] ++ ldflags += [ "--target=aarch64-linux-gnu" ] ++ } + } + if (is_android) { + # Outline atomics crash on Exynos 9810. http://crbug.com/1272795 +--- a/build/toolchain/linux/unbundle/BUILD.gn.orig ++++ b/build/toolchain/linux/unbundle/BUILD.gn +@@ -39,3 +39,22 @@ + current_os = host_os + } + } ++ ++gcc_toolchain("v8_snapshot_cross") { ++ cc = getenv("BUILD_CC") ++ cxx = getenv("BUILD_CXX") ++ ar = getenv("BUILD_AR") ++ nm = getenv("BUILD_NM") ++ ld = cxx ++ ++ extra_cflags = getenv("BUILD_CFLAGS") ++ extra_cppflags = getenv("BUILD_CPPFLAGS") ++ extra_cxxflags = getenv("BUILD_CXXFLAGS") ++ extra_ldflags = getenv("BUILD_LDFLAGS") ++ ++ toolchain_args = { ++ current_cpu = host_cpu ++ current_os = host_os ++ v8_current_cpu = target_cpu ++ } ++} +--- a/build/config/linux/pkg_config.gni.orig ++++ b/build/config/linux/pkg_config.gni +@@ -91,7 +91,7 @@ + assert(defined(invoker.packages), + "Variable |packages| must be defined to be a list in pkg_config.") + config(target_name) { +- if (host_toolchain == current_toolchain) { ++ if (current_cpu != target_cpu) { + args = common_pkg_config_args + host_pkg_config_args + invoker.packages + } else { + args = common_pkg_config_args + pkg_config_args + invoker.packages diff --git a/srcpkgs/electron33/files/patches/chromium-fc-cache-version.patch b/srcpkgs/electron33/files/patches/chromium-fc-cache-version.patch new file mode 100644 index 00000000000..3b768978a43 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fc-cache-version.patch @@ -0,0 +1,13 @@ +instead of hardcoding the version, use the defined macro. +-- +--- a/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc ++++ b/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc +@@ -56,7 +56,7 @@ + FcFini(); + + // Check existence of intended fontconfig cache file. +- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-9"; ++ auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION; + bool cache_exists = access(cache.c_str(), F_OK) == 0; + return !cache_exists; + } diff --git a/srcpkgs/electron33/files/patches/chromium-fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/electron33/files/patches/chromium-fix-aarch64-musl-memory-tagging-macros.patch new file mode 100644 index 00000000000..b3dd2c33f0f --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-aarch64-musl-memory-tagging-macros.patch @@ -0,0 +1,29 @@ +--- a/base/allocator/partition_allocator/src/partition_alloc/tagging.cc ++++ b/base/allocator/partition_allocator/src/partition_alloc/tagging.cc +@@ -28,13 +28,25 @@ + #endif + #endif + +-#ifndef HAS_PR_MTE_MACROS ++#ifndef PR_MTE_TCF_SHIFT + #define PR_MTE_TCF_SHIFT 1 ++#endif ++#ifndef PR_MTE_TCF_NONE + #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_SYNC + #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_ASYNC + #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_MASK + #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TAG_SHIFT + #define PR_MTE_TAG_SHIFT 3 ++#endif ++#ifndef PR_MTE_TAG_MASK + #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) + #endif + #endif diff --git a/srcpkgs/electron33/files/patches/chromium-fix-argument_spec-isnan-isinf.patch b/srcpkgs/electron33/files/patches/chromium-fix-argument_spec-isnan-isinf.patch new file mode 100644 index 00000000000..837a0312dcb --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-argument_spec-isnan-isinf.patch @@ -0,0 +1,11 @@ +--- a/extensions/renderer/bindings/argument_spec.cc ++++ b/extensions/renderer/bindings/argument_spec.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "extensions/renderer/bindings/argument_spec.h" + + #include "base/check.h" diff --git a/srcpkgs/electron33/files/patches/chromium-fix-constexpr-narrowing.patch b/srcpkgs/electron33/files/patches/chromium-fix-constexpr-narrowing.patch new file mode 100644 index 00000000000..570ca6e69a8 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-constexpr-narrowing.patch @@ -0,0 +1,21 @@ +--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc.orig ++++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc +@@ -3881,15 +3881,15 @@ + const T&... values) { + std::string strkey = std::string(key); + +- if constexpr (Flags & kEncrypted) { ++ if constexpr (Flags & kEncrypted != 0) { + if (is_encrypted_) + UmaFunction(strkey + ".EME", values...); + } + +- if constexpr (Flags & kTotal) ++ if constexpr (Flags & kTotal != 0) + UmaFunction(strkey + ".All", values...); + +- if constexpr (Flags & kPlaybackType) { ++ if constexpr (Flags & kPlaybackType != 0) { + auto demuxer_type = GetDemuxerType(); + if (!demuxer_type.has_value()) + return; diff --git a/srcpkgs/electron33/files/patches/chromium-fix-libc-version-include.patch b/srcpkgs/electron33/files/patches/chromium-fix-libc-version-include.patch new file mode 100644 index 00000000000..d94dcf6deac --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-libc-version-include.patch @@ -0,0 +1,15 @@ +--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc ++++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +@@ -61,8 +61,11 @@ + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++ ++#if defined(__GLIBC__) + #include ++#endif + + #include "base/linux_util.h" + #include "base/strings/string_split.h" diff --git a/srcpkgs/electron33/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch b/srcpkgs/electron33/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch new file mode 100644 index 00000000000..b56717b9ce3 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch @@ -0,0 +1,21 @@ +This macro is defined in glibc, but not musl. + +--- a/sandbox/linux/suid/process_util.h.orig ++++ b/sandbox/linux/suid/process_util.h +@@ -11,6 +11,16 @@ + #include + #include + ++// Some additional functions ++#if !defined(TEMP_FAILURE_RETRY) ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + // This adjusts /proc/process/oom_score_adj so the Linux OOM killer + // will prefer certain process types over others. The range for the + // adjustment is [-1000, 1000], with [0, 1000] being user accessible. diff --git a/srcpkgs/electron33/files/patches/chromium-fix-missing-cstdint-include-musl.patch b/srcpkgs/electron33/files/patches/chromium-fix-missing-cstdint-include-musl.patch new file mode 100644 index 00000000000..6ca2897f3dd --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-missing-cstdint-include-musl.patch @@ -0,0 +1,10 @@ +--- a/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h ++++ b/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h +@@ -3,6 +3,7 @@ + + #include + ++#include + #include + + #include "quiche/common/platform/api/quiche_export.h" diff --git a/srcpkgs/electron33/files/patches/chromium-fix-musl-missing-unistd_h-include.patch b/srcpkgs/electron33/files/patches/chromium-fix-musl-missing-unistd_h-include.patch new file mode 100644 index 00000000000..e14d009a9e0 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-musl-missing-unistd_h-include.patch @@ -0,0 +1,10 @@ +--- a/sandbox/linux/services/credentials.h ++++ b/sandbox/linux/services/credentials.h +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "sandbox/linux/system_headers/capability.h" + #include "sandbox/sandbox_export.h" diff --git a/srcpkgs/electron33/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch b/srcpkgs/electron33/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch new file mode 100644 index 00000000000..4014d1ee5e6 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch @@ -0,0 +1,22 @@ +--- a/third_party/perfetto/include/perfetto/ext/base/thread_utils.h ++++ b/third_party/perfetto/include/perfetto/ext/base/thread_utils.h +@@ -30,7 +30,8 @@ + #include + #endif + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__)) + #include + #endif + +@@ -58,7 +59,8 @@ + + inline bool GetThreadName(std::string& out_result) { + char buf[16] = {}; +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__)) + if (prctl(PR_GET_NAME, buf) != 0) + return false; + #else diff --git a/srcpkgs/electron33/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch b/srcpkgs/electron33/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/srcpkgs/electron33/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron33/files/patches/chromium-libc_malloc.patch new file mode 100644 index 00000000000..414f28765d6 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-libc_malloc.patch @@ -0,0 +1,34 @@ +--- a/base/process/memory_linux.cc ++++ b/base/process/memory_linux.cc +@@ -18,6 +18,13 @@ + #include "base/threading/thread_restrictions.h" + #include "build/build_config.h" + ++#if defined(LIBC_GLIBC) ++extern "C" { ++extern void *__libc_malloc(size_t size); ++extern void *__libc_free(void *ptr); ++} ++#endif ++ + namespace base { + + namespace { +@@ -111,7 +118,7 @@ + #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC) + *result = malloc(size); + #elif defined(LIBC_GLIBC) +- *result = __libc_malloc(size); ++ *result = ::__libc_malloc(size); + #endif + return *result != nullptr; + } +@@ -122,7 +129,7 @@ + #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC) + free(ptr); + #elif defined(LIBC_GLIBC) +- __libc_free(ptr); ++ ::__libc_free(ptr); + #endif + } + diff --git a/srcpkgs/electron33/files/patches/chromium-musl-no-execinfo.patch b/srcpkgs/electron33/files/patches/chromium-musl-no-execinfo.patch new file mode 100644 index 00000000000..12064bad0a3 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-musl-no-execinfo.patch @@ -0,0 +1,68 @@ +musl does not have execinfo.h, and hence no implementation of +. backtrace() +. backtrace_symbols() +for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 +-- +--- a/v8/src/codegen/external-reference-table.cc ++++ b/v8/src/codegen/external-reference-table.cc +@@ -11,7 +11,9 @@ + + #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) + #define SYMBOLIZE_FUNCTION ++#if defined(__GLIBC__) + #include ++#endif + + #include + +@@ -96,7 +98,7 @@ + } + + const char* ExternalReferenceTable::ResolveSymbol(void* address) { +-#ifdef SYMBOLIZE_FUNCTION ++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__) + char** names = backtrace_symbols(&address, 1); + const char* name = names[0]; + // The array of names is malloc'ed. However, each name string is static +--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h ++++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h +@@ -58,7 +58,7 @@ + #define HAVE_ERRNO_H 1 + + /* Define to 1 if you have the header file. */ +-#define HAVE_EXECINFO_H 1 ++/* #define HAVE_EXECINFO_H 1 */ + + /* Define to 1 if you have the header file. */ + #define HAVE_FCNTL_H 1 +--- a/base/debug/stack_trace.cc ++++ b/base/debug/stack_trace.cc +@@ -311,7 +311,7 @@ + + std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); +@@ -335,7 +335,7 @@ + } + + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; +--- a/base/debug/stack_trace_unittest.cc ++++ b/base/debug/stack_trace_unittest.cc +@@ -33,7 +33,7 @@ + typedef testing::Test StackTraceTest; + #endif + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && defined(__GLIBC__) + // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. + // See https://crbug.com/706728 + diff --git a/srcpkgs/electron33/files/patches/chromium-musl-partition-atfork.patch b/srcpkgs/electron33/files/patches/chromium-musl-partition-atfork.patch new file mode 100644 index 00000000000..598efe24762 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-musl-partition-atfork.patch @@ -0,0 +1,11 @@ +--- a/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc ++++ b/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc +@@ -239,7 +239,7 @@ + if (!g_global_init_called.compare_exchange_strong(expected, true)) + return; + +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || PA_BUILDFLAG(IS_CHROMEOS) + // When fork() is called, only the current thread continues to execute in the + // child process. If the lock is held, but *not* by this thread when fork() is + // called, we have a deadlock. diff --git a/srcpkgs/electron33/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/electron33/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch new file mode 100644 index 00000000000..56a4ad1c807 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch @@ -0,0 +1,24 @@ +Use monotonic clock for pthread_cond_timedwait with musl too. + +diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc +index 5ea7083..c13027e 100644 +--- a/v8/src/base/platform/condition-variable.cc ++++ b/v8/src/base/platform/condition-variable.cc +@@ -16,7 +16,7 @@ namespace base { + + ConditionVariable::ConditionVariable() { + #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ +- (V8_OS_LINUX && V8_LIBC_GLIBC)) ++ V8_OS_LINUX) + // On Free/Net/OpenBSD and Linux with glibc we can change the time + // source for pthread_cond_timedwait() to use the monotonic clock. + pthread_condattr_t attr; +@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) { + &native_handle_, &mutex->native_handle(), &ts); + #else + #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ +- (V8_OS_LINUX && V8_LIBC_GLIBC)) ++ V8_OS_LINUX) + // On Free/Net/OpenBSD and Linux with glibc we can change the time + // source for pthread_cond_timedwait() to use the monotonic clock. + result = clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/srcpkgs/electron33/files/patches/chromium-no-getcontext.patch b/srcpkgs/electron33/files/patches/chromium-no-getcontext.patch new file mode 100644 index 00000000000..f9bc2e02d24 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-no-getcontext.patch @@ -0,0 +1,27 @@ +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 09:59:55.554536646 +0100 ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 10:01:16.818238035 +0100 +@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); + ucontext_t context; ++#if defined(__GLIBC__) + getcontext(&context); ++#endif + return HandleSignal(sig, &siginfo, &context); + } + +@@ -647,9 +649,14 @@ bool ExceptionHandler::WriteMinidump() { + sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); + + CrashContext context; ++ ++#if defined(__GLIBC__) + int getcontext_result = getcontext(&context.context); + if (getcontext_result) + return false; ++#else ++ return false; ++#endif + + #if defined(__i386__) + // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved diff --git a/srcpkgs/electron33/files/patches/chromium-reenable-linux-i686-builds.patch b/srcpkgs/electron33/files/patches/chromium-reenable-linux-i686-builds.patch new file mode 100644 index 00000000000..b18718e4364 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-reenable-linux-i686-builds.patch @@ -0,0 +1,19 @@ +--- a/BUILD.gn.orig ++++ b/BUILD.gn +@@ -1616,16 +1616,6 @@ + } + } + +-# TODO(cassew): Add more OS's that don't support x86. +-is_valid_x86_target = +- target_os != "ios" && target_os != "mac" && +- (target_os != "linux" || use_libfuzzer || !build_with_chromium) +- +-# Note: v8_target_cpu == arm allows using the V8 arm simulator on x86 for fuzzing. +-assert( +- is_valid_x86_target || target_cpu != "x86" || v8_target_cpu == "arm", +- "'target_cpu=x86' is not supported for 'target_os=$target_os'. Consider omitting 'target_cpu' (default) or using 'target_cpu=x64' instead.") +- + group("chromium_builder_perf") { + testonly = true + diff --git a/srcpkgs/electron33/files/patches/chromium-remove-sys-cdefs-includes.patch b/srcpkgs/electron33/files/patches/chromium-remove-sys-cdefs-includes.patch new file mode 100644 index 00000000000..00344073f46 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-remove-sys-cdefs-includes.patch @@ -0,0 +1,39 @@ +--- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h ++++ b/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h +@@ -17,8 +17,6 @@ + + #include_next + +-#include +- + // https://sourceware.org/bugzilla/show_bug.cgi?id=22433 + #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \ + defined(__GLIBC__) +--- a/third_party/libsync/src/include/sync/sync.h ++++ b/third_party/libsync/src/include/sync/sync.h +@@ -19,12 +19,13 @@ + #ifndef __SYS_CORE_SYNC_H + #define __SYS_CORE_SYNC_H + +-#include + #include + + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + struct sync_legacy_merge_data { + int32_t fd2; +@@ -158,6 +159,8 @@ + struct sync_pt_info *itr); + void sync_fence_info_free(struct sync_fence_info_data *info); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __SYS_CORE_SYNC_H */ diff --git a/srcpkgs/electron33/files/patches/chromium-sandbox-membarrier.patch b/srcpkgs/electron33/files/patches/chromium-sandbox-membarrier.patch new file mode 100644 index 00000000000..55ef2516194 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-sandbox-membarrier.patch @@ -0,0 +1,10 @@ +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -370,6 +370,7 @@ + switch (sysno) { + case __NR_exit: + case __NR_exit_group: ++ case __NR_membarrier: + case __NR_wait4: + case __NR_waitid: + #if defined(__i386__) diff --git a/srcpkgs/electron33/files/patches/chromium-sndio.patch b/srcpkgs/electron33/files/patches/chromium-sndio.patch new file mode 100644 index 00000000000..cc4e858d2ab --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-sndio.patch @@ -0,0 +1,875 @@ +diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn +--- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200 ++++ - 2024-09-19 19:44:06.486438185 +0200 +@@ -66,6 +66,7 @@ + "USE_CHROMEOS_PROTECTED_MEDIA=$use_chromeos_protected_media", + "USE_CRAS=$use_cras", + "USE_PROPRIETARY_CODECS=$proprietary_codecs", ++ "USE_SNDIO=$use_sndio", + ] + + if (enable_library_cdms) { +diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn +--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200 ++++ b/media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200 +@@ -236,6 +236,17 @@ + sources += [ "linux/audio_manager_linux.cc" ] + } + ++ if (use_sndio) { ++ libs += [ "sndio" ] ++ sources += [ ++ "sndio/audio_manager_sndio.cc", ++ "sndio/sndio_input.cc", ++ "sndio/sndio_input.h", ++ "sndio/sndio_output.cc", ++ "sndio/sndio_output.h" ++ ] ++ } ++ + if (use_alsa) { + libs += [ "asound" ] + sources += [ +diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc +--- a/media/audio/linux/audio_manager_linux.cc 2020-06-03 20:39:37.000000000 +0200 ++++ b/media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200 +@@ -19,6 +19,11 @@ + #include "media/audio/pulse/audio_manager_pulse.h" + #include "media/audio/pulse/pulse_util.h" + #endif ++#if defined(USE_SNDIO) ++#include "media/audio/sndio/audio_manager_sndio.h" ++#include "media/audio/sndio/sndio_input.h" ++#include "media/audio/sndio/sndio_output.h" ++#endif + + namespace media { + + std::unique_ptr CreateAudioManager( +@@ -39,6 +45,16 @@ + audio_log_factory); + } + ++#if defined(USE_SNDIO) ++ struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); ++ if (hdl != NULL) { ++ sio_close(hdl); ++ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1); ++ return std::make_unique(std::move(audio_thread), ++ audio_log_factory); ++ } ++#endif ++ + #if defined(USE_CRAS) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) { + UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1); +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc +--- a/media/audio/sndio/audio_manager_sndio.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,148 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "media/audio/sndio/audio_manager_sndio.h" ++ ++#include "base/metrics/histogram_macros.h" ++#include "base/memory/ptr_util.h" ++#include "media/audio/audio_device_description.h" ++#include "media/audio/audio_output_dispatcher.h" ++#include "media/audio/sndio/sndio_input.h" ++#include "media/audio/sndio/sndio_output.h" ++#include "media/base/limits.h" ++#include "media/base/media_switches.h" ++ ++namespace media { ++ ++ ++// Maximum number of output streams that can be open simultaneously. ++static const int kMaxOutputStreams = 4; ++ ++// Default sample rate for input and output streams. ++static const int kDefaultSampleRate = 48000; ++ ++void AddDefaultDevice(AudioDeviceNames* device_names) { ++ DCHECK(device_names->empty()); ++ device_names->push_front(AudioDeviceName::CreateDefault()); ++} ++ ++bool AudioManagerSndio::HasAudioOutputDevices() { ++ return true; ++} ++ ++bool AudioManagerSndio::HasAudioInputDevices() { ++ return true; ++} ++ ++void AudioManagerSndio::GetAudioInputDeviceNames( ++ AudioDeviceNames* device_names) { ++ DCHECK(device_names->empty()); ++ AddDefaultDevice(device_names); ++} ++ ++void AudioManagerSndio::GetAudioOutputDeviceNames( ++ AudioDeviceNames* device_names) { ++ AddDefaultDevice(device_names); ++} ++ ++const char* AudioManagerSndio::GetName() { ++ return "SNDIO"; ++} ++ ++AudioParameters AudioManagerSndio::GetInputStreamParameters( ++ const std::string& device_id) { ++ static const int kDefaultInputBufferSize = 1024; ++ ++ int user_buffer_size = GetUserBufferSize(); ++ int buffer_size = user_buffer_size ? ++ user_buffer_size : kDefaultInputBufferSize; ++ ++ return AudioParameters( ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, ++ kDefaultSampleRate, buffer_size); ++} ++ ++AudioManagerSndio::AudioManagerSndio(std::unique_ptr audio_thread, ++ AudioLogFactory* audio_log_factory) ++ : AudioManagerBase(std::move(audio_thread), ++ audio_log_factory) { ++ DLOG(WARNING) << "AudioManagerSndio"; ++ SetMaxOutputStreamsAllowed(kMaxOutputStreams); ++} ++ ++AudioManagerSndio::~AudioManagerSndio() { ++ Shutdown(); ++} ++ ++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream( ++ const AudioParameters& params, ++ const LogCallback& log_callback) { ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); ++ return MakeOutputStream(params); ++} ++ ++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) { ++ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); ++ return MakeOutputStream(params); ++} ++ ++AudioInputStream* AudioManagerSndio::MakeLinearInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) { ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); ++ return MakeInputStream(params); ++} ++ ++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) { ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); ++ return MakeInputStream(params); ++} ++ ++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters( ++ const std::string& output_device_id, ++ const AudioParameters& input_params) { ++ // TODO(tommi): Support |output_device_id|. ++ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; ++ static const int kDefaultOutputBufferSize = 2048; ++ ++ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; ++ int sample_rate = kDefaultSampleRate; ++ int buffer_size = kDefaultOutputBufferSize; ++ if (input_params.IsValid()) { ++ sample_rate = input_params.sample_rate(); ++ channel_layout = input_params.channel_layout(); ++ buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); ++ } ++ ++ int user_buffer_size = GetUserBufferSize(); ++ if (user_buffer_size) ++ buffer_size = user_buffer_size; ++ ++ return AudioParameters( ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, ++ sample_rate, buffer_size); ++} ++ ++AudioInputStream* AudioManagerSndio::MakeInputStream( ++ const AudioParameters& params) { ++ DLOG(WARNING) << "MakeInputStream"; ++ return new SndioAudioInputStream(this, ++ AudioDeviceDescription::kDefaultDeviceId, params); ++} ++ ++AudioOutputStream* AudioManagerSndio::MakeOutputStream( ++ const AudioParameters& params) { ++ DLOG(WARNING) << "MakeOutputStream"; ++ return new SndioAudioOutputStream(params, this); ++} ++ ++} // namespace media +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h +--- a/media/audio/sndio/audio_manager_sndio.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,65 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ ++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ ++ ++#include ++ ++#include "base/compiler_specific.h" ++#include "base/macros.h" ++#include "base/memory/ref_counted.h" ++#include "base/threading/thread.h" ++#include "media/audio/audio_manager_base.h" ++ ++namespace media { ++ ++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase { ++ public: ++ AudioManagerSndio(std::unique_ptr audio_thread, ++ AudioLogFactory* audio_log_factory); ++ ~AudioManagerSndio() override; ++ ++ // Implementation of AudioManager. ++ bool HasAudioOutputDevices() override; ++ bool HasAudioInputDevices() override; ++ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; ++ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; ++ AudioParameters GetInputStreamParameters( ++ const std::string& device_id) override; ++ const char* GetName() override; ++ ++ // Implementation of AudioManagerBase. ++ AudioOutputStream* MakeLinearOutputStream( ++ const AudioParameters& params, ++ const LogCallback& log_callback) override; ++ AudioOutputStream* MakeLowLatencyOutputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) override; ++ AudioInputStream* MakeLinearInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) override; ++ AudioInputStream* MakeLowLatencyInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) override; ++ ++ protected: ++ AudioParameters GetPreferredOutputStreamParameters( ++ const std::string& output_device_id, ++ const AudioParameters& input_params) override; ++ ++ private: ++ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. ++ AudioOutputStream* MakeOutputStream(const AudioParameters& params); ++ AudioInputStream* MakeInputStream(const AudioParameters& params); ++ ++ DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio); ++}; ++ ++} // namespace media ++ ++#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc +--- a/media/audio/sndio/sndio_input.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,200 @@ ++// Copyright 2013 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "base/bind.h" ++#include "base/logging.h" ++#include "base/macros.h" ++#include "media/base/audio_timestamp_helper.h" ++#include "media/audio/sndio/audio_manager_sndio.h" ++#include "media/audio/audio_manager.h" ++#include "media/audio/sndio/sndio_input.h" ++ ++namespace media { ++ ++static const SampleFormat kSampleFormat = kSampleFormatS16; ++ ++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta) ++{ ++ SndioAudioInputStream* self = static_cast(arg); ++ ++ self->hw_delay += delta; ++} ++ ++void *SndioAudioInputStream::ThreadEntry(void *arg) { ++ SndioAudioInputStream* self = static_cast(arg); ++ ++ self->ThreadLoop(); ++ return NULL; ++} ++ ++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager, ++ const std::string& device_name, ++ const AudioParameters& params) ++ : manager(manager), ++ params(params), ++ audio_bus(AudioBus::Create(params)), ++ state(kClosed) { ++} ++ ++SndioAudioInputStream::~SndioAudioInputStream() { ++ if (state != kClosed) ++ Close(); ++} ++ ++bool SndioAudioInputStream::Open() { ++ struct sio_par par; ++ int sig; ++ ++ if (state != kClosed) ++ return false; ++ ++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && ++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { ++ LOG(WARNING) << "Unsupported audio format."; ++ return false; ++ } ++ ++ sio_initpar(&par); ++ par.rate = params.sample_rate(); ++ par.rchan = params.channels(); ++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); ++ par.bps = par.bits / 8; ++ par.sig = sig = par.bits != 8 ? 1 : 0; ++ par.le = SIO_LE_NATIVE; ++ par.appbufsz = params.frames_per_buffer(); ++ ++ hdl = sio_open(SIO_DEVANY, SIO_REC, 0); ++ ++ if (hdl == NULL) { ++ LOG(ERROR) << "Couldn't open audio device."; ++ return false; ++ } ++ ++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { ++ LOG(ERROR) << "Couldn't set audio parameters."; ++ goto bad_close; ++ } ++ ++ if (par.rate != (unsigned int)params.sample_rate() || ++ par.rchan != (unsigned int)params.channels() || ++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || ++ par.sig != (unsigned int)sig || ++ (par.bps > 1 && par.le != SIO_LE_NATIVE) || ++ (par.bits != par.bps * 8)) { ++ LOG(ERROR) << "Unsupported audio parameters."; ++ goto bad_close; ++ } ++ state = kStopped; ++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; ++ sio_onmove(hdl, &OnMoveCallback, this); ++ return true; ++bad_close: ++ sio_close(hdl); ++ return false; ++} ++ ++void SndioAudioInputStream::Start(AudioInputCallback* cb) { ++ ++ StartAgc(); ++ ++ state = kRunning; ++ hw_delay = 0; ++ callback = cb; ++ sio_start(hdl); ++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { ++ LOG(ERROR) << "Failed to create real-time thread for recording."; ++ sio_stop(hdl); ++ state = kStopped; ++ } ++} ++ ++void SndioAudioInputStream::Stop() { ++ ++ if (state == kStopped) ++ return; ++ ++ state = kStopWait; ++ pthread_join(thread, NULL); ++ sio_stop(hdl); ++ state = kStopped; ++ ++ StopAgc(); ++} ++ ++void SndioAudioInputStream::Close() { ++ ++ if (state == kClosed) ++ return; ++ ++ if (state == kRunning) ++ Stop(); ++ ++ state = kClosed; ++ delete [] buffer; ++ sio_close(hdl); ++ ++ manager->ReleaseInputStream(this); ++} ++ ++double SndioAudioInputStream::GetMaxVolume() { ++ // Not supported ++ return 0.0; ++} ++ ++void SndioAudioInputStream::SetVolume(double volume) { ++ // Not supported. Do nothing. ++} ++ ++double SndioAudioInputStream::GetVolume() { ++ // Not supported. ++ return 0.0; ++} ++ ++bool SndioAudioInputStream::IsMuted() { ++ // Not supported. ++ return false; ++} ++ ++void SndioAudioInputStream::SetOutputDeviceForAec( ++ const std::string& output_device_id) { ++ // Not supported. ++} ++ ++void SndioAudioInputStream::ThreadLoop(void) { ++ size_t todo, n; ++ char *data; ++ unsigned int nframes; ++ double normalized_volume = 0.0; ++ ++ nframes = audio_bus->frames(); ++ ++ while (state == kRunning && !sio_eof(hdl)) { ++ ++ GetAgcVolume(&normalized_volume); ++ ++ // read one block ++ todo = nframes * params.GetBytesPerFrame(kSampleFormat); ++ data = buffer; ++ while (todo > 0) { ++ n = sio_read(hdl, data, todo); ++ if (n == 0) ++ return; // unrecoverable I/O error ++ todo -= n; ++ data += n; ++ } ++ hw_delay -= nframes; ++ ++ // convert frames count to TimeDelta ++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, ++ params.sample_rate()); ++ ++ // push into bus ++ audio_bus->FromInterleaved(reinterpret_cast(buffer), nframes); ++ ++ // invoke callback ++ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.); ++ } ++} ++ ++} // namespace media +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h +--- a/media/audio/sndio/sndio_input.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,91 @@ ++// Copyright 2013 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ ++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ ++ ++#include ++#include ++#include ++ ++#include "base/compiler_specific.h" ++#include "base/macros.h" ++#include "base/memory/weak_ptr.h" ++#include "base/time/time.h" ++#include "media/audio/agc_audio_stream.h" ++#include "media/audio/audio_io.h" ++#include "media/audio/audio_device_description.h" ++#include "media/base/audio_parameters.h" ++ ++namespace media { ++ ++class AudioManagerBase; ++ ++// Implementation of AudioOutputStream using sndio(7) ++class SndioAudioInputStream : public AgcAudioStream { ++ public: ++ // Pass this to the constructor if you want to attempt auto-selection ++ // of the audio recording device. ++ static const char kAutoSelectDevice[]; ++ ++ // Create a PCM Output stream for the SNDIO device identified by ++ // |device_name|. If unsure of what to use for |device_name|, use ++ // |kAutoSelectDevice|. ++ SndioAudioInputStream(AudioManagerBase* audio_manager, ++ const std::string& device_name, ++ const AudioParameters& params); ++ ++ ~SndioAudioInputStream() override; ++ ++ // Implementation of AudioInputStream. ++ bool Open() override; ++ void Start(AudioInputCallback* callback) override; ++ void Stop() override; ++ void Close() override; ++ double GetMaxVolume() override; ++ void SetVolume(double volume) override; ++ double GetVolume() override; ++ bool IsMuted() override; ++ void SetOutputDeviceForAec(const std::string& output_device_id) override; ++ ++ private: ++ ++ enum StreamState { ++ kClosed, // Not opened yet ++ kStopped, // Device opened, but not started yet ++ kRunning, // Started, device playing ++ kStopWait // Stopping, waiting for the real-time thread to exit ++ }; ++ ++ // C-style call-backs ++ static void OnMoveCallback(void *arg, int delta); ++ static void* ThreadEntry(void *arg); ++ ++ // Continuously moves data from the device to the consumer ++ void ThreadLoop(); ++ // Our creator, the audio manager needs to be notified when we close. ++ AudioManagerBase* manager; ++ // Parameters of the source ++ AudioParameters params; ++ // We store data here for consumer ++ std::unique_ptr audio_bus; ++ // Call-back that consumes recorded data ++ AudioInputCallback* callback; // Valid during a recording session. ++ // Handle of the audio device ++ struct sio_hdl* hdl; ++ // Current state of the stream ++ enum StreamState state; ++ // High priority thread running ThreadLoop() ++ pthread_t thread; ++ // Number of frames buffered in the hardware ++ int hw_delay; ++ // Temporary buffer where data is stored sndio-compatible format ++ char* buffer; ++ ++ DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream); ++}; ++ ++} // namespace media ++ ++#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc +--- a/media/audio/sndio/sndio_output.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,183 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "base/logging.h" ++#include "base/time/time.h" ++#include "base/time/default_tick_clock.h" ++#include "media/audio/audio_manager_base.h" ++#include "media/base/audio_timestamp_helper.h" ++#include "media/audio/sndio/sndio_output.h" ++ ++namespace media { ++ ++static const SampleFormat kSampleFormat = kSampleFormatS16; ++ ++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { ++ SndioAudioOutputStream* self = static_cast(arg); ++ ++ self->hw_delay -= delta; ++} ++ ++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) { ++ SndioAudioOutputStream* self = static_cast(arg); ++ ++ self->vol = vol; ++} ++ ++void *SndioAudioOutputStream::ThreadEntry(void *arg) { ++ SndioAudioOutputStream* self = static_cast(arg); ++ ++ self->ThreadLoop(); ++ return NULL; ++} ++ ++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params, ++ AudioManagerBase* manager) ++ : manager(manager), ++ params(params), ++ audio_bus(AudioBus::Create(params)), ++ state(kClosed), ++ mutex(PTHREAD_MUTEX_INITIALIZER) { ++} ++ ++SndioAudioOutputStream::~SndioAudioOutputStream() { ++ if (state != kClosed) ++ Close(); ++} ++ ++bool SndioAudioOutputStream::Open() { ++ struct sio_par par; ++ int sig; ++ ++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && ++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { ++ LOG(WARNING) << "Unsupported audio format."; ++ return false; ++ } ++ sio_initpar(&par); ++ par.rate = params.sample_rate(); ++ par.pchan = params.channels(); ++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); ++ par.bps = par.bits / 8; ++ par.sig = sig = par.bits != 8 ? 1 : 0; ++ par.le = SIO_LE_NATIVE; ++ par.appbufsz = params.frames_per_buffer(); ++ ++ hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); ++ if (hdl == NULL) { ++ LOG(ERROR) << "Couldn't open audio device."; ++ return false; ++ } ++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { ++ LOG(ERROR) << "Couldn't set audio parameters."; ++ goto bad_close; ++ } ++ if (par.rate != (unsigned int)params.sample_rate() || ++ par.pchan != (unsigned int)params.channels() || ++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || ++ par.sig != (unsigned int)sig || ++ (par.bps > 1 && par.le != SIO_LE_NATIVE) || ++ (par.bits != par.bps * 8)) { ++ LOG(ERROR) << "Unsupported audio parameters."; ++ goto bad_close; ++ } ++ state = kStopped; ++ volpending = 0; ++ vol = 0; ++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; ++ sio_onmove(hdl, &OnMoveCallback, this); ++ sio_onvol(hdl, &OnVolCallback, this); ++ return true; ++ bad_close: ++ sio_close(hdl); ++ return false; ++} ++ ++void SndioAudioOutputStream::Close() { ++ if (state == kClosed) ++ return; ++ if (state == kRunning) ++ Stop(); ++ state = kClosed; ++ delete [] buffer; ++ sio_close(hdl); ++ manager->ReleaseOutputStream(this); // Calls the destructor ++} ++ ++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { ++ state = kRunning; ++ hw_delay = 0; ++ source = callback; ++ sio_start(hdl); ++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { ++ LOG(ERROR) << "Failed to create real-time thread."; ++ sio_stop(hdl); ++ state = kStopped; ++ } ++} ++ ++void SndioAudioOutputStream::Stop() { ++ if (state == kStopped) ++ return; ++ state = kStopWait; ++ pthread_join(thread, NULL); ++ sio_stop(hdl); ++ state = kStopped; ++} ++ ++void SndioAudioOutputStream::SetVolume(double v) { ++ pthread_mutex_lock(&mutex); ++ vol = v * SIO_MAXVOL; ++ volpending = 1; ++ pthread_mutex_unlock(&mutex); ++} ++ ++void SndioAudioOutputStream::GetVolume(double* v) { ++ pthread_mutex_lock(&mutex); ++ *v = vol * (1. / SIO_MAXVOL); ++ pthread_mutex_unlock(&mutex); ++} ++ ++// This stream is always used with sub second buffer sizes, where it's ++// sufficient to simply always flush upon Start(). ++void SndioAudioOutputStream::Flush() {} ++ ++void SndioAudioOutputStream::ThreadLoop(void) { ++ int avail, count, result; ++ ++ while (state == kRunning) { ++ // Update volume if needed ++ pthread_mutex_lock(&mutex); ++ if (volpending) { ++ volpending = 0; ++ sio_setvol(hdl, vol); ++ } ++ pthread_mutex_unlock(&mutex); ++ ++ // Get data to play ++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, ++ params.sample_rate()); ++ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); ++ audio_bus->ToInterleaved(count, reinterpret_cast(buffer)); ++ if (count == 0) { ++ // We have to submit something to the device ++ count = audio_bus->frames(); ++ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat)); ++ LOG(WARNING) << "No data to play, running empty cycle."; ++ } ++ ++ // Submit data to the device ++ avail = count * params.GetBytesPerFrame(kSampleFormat); ++ result = sio_write(hdl, buffer, avail); ++ if (result == 0) { ++ LOG(WARNING) << "Audio device disconnected."; ++ break; ++ } ++ ++ // Update hardware pointer ++ hw_delay += count; ++ } ++} ++ ++} // namespace media +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h +--- a/media/audio/sndio/sndio_output.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,86 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ ++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ ++ ++#include ++#include ++ ++#include "base/time/tick_clock.h" ++#include "base/time/time.h" ++#include "media/audio/audio_io.h" ++ ++namespace media { ++ ++class AudioManagerBase; ++ ++// Implementation of AudioOutputStream using sndio(7) ++class SndioAudioOutputStream : public AudioOutputStream { ++ public: ++ // The manager is creating this object ++ SndioAudioOutputStream(const AudioParameters& params, ++ AudioManagerBase* manager); ++ virtual ~SndioAudioOutputStream(); ++ ++ // Implementation of AudioOutputStream. ++ bool Open() override; ++ void Close() override; ++ void Start(AudioSourceCallback* callback) override; ++ void Stop() override; ++ void SetVolume(double volume) override; ++ void GetVolume(double* volume) override; ++ void Flush() override; ++ ++ friend void sndio_onmove(void *arg, int delta); ++ friend void sndio_onvol(void *arg, unsigned int vol); ++ friend void *sndio_threadstart(void *arg); ++ ++ private: ++ enum StreamState { ++ kClosed, // Not opened yet ++ kStopped, // Device opened, but not started yet ++ kRunning, // Started, device playing ++ kStopWait // Stopping, waiting for the real-time thread to exit ++ }; ++ ++ // C-style call-backs ++ static void OnMoveCallback(void *arg, int delta); ++ static void OnVolCallback(void *arg, unsigned int vol); ++ static void* ThreadEntry(void *arg); ++ ++ // Continuously moves data from the producer to the device ++ void ThreadLoop(void); ++ ++ // Our creator, the audio manager needs to be notified when we close. ++ AudioManagerBase* manager; ++ // Parameters of the source ++ AudioParameters params; ++ // Source stores data here ++ std::unique_ptr audio_bus; ++ // Call-back that produces data to play ++ AudioSourceCallback* source; ++ // Handle of the audio device ++ struct sio_hdl* hdl; ++ // Current state of the stream ++ enum StreamState state; ++ // High priority thread running ThreadLoop() ++ pthread_t thread; ++ // Protects vol, volpending and hw_delay ++ pthread_mutex_t mutex; ++ // Current volume in the 0..SIO_MAXVOL range ++ int vol; ++ // Set to 1 if volumes must be refreshed in the realtime thread ++ int volpending; ++ // Number of frames buffered in the hardware ++ int hw_delay; ++ // Temporary buffer where data is stored sndio-compatible format ++ char* buffer; ++ ++ DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream); ++}; ++ ++} // namespace media ++ ++#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ +diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni +--- a/media/media_options.gni ++++ b/media/media_options.gni +@@ -158,6 +158,9 @@ + # Enables runtime selection of ALSA library for audio. + use_alsa = false + ++ # Enable runtime selection of sndio(7) ++ use_sndio = false ++ + # Alsa should be used on all non-Android, non-Mac POSIX systems - with the + # exception of CastOS desktop builds. + # diff --git a/srcpkgs/electron33/files/patches/chromium-systypes.patch b/srcpkgs/electron33/files/patches/chromium-systypes.patch new file mode 100644 index 00000000000..1ccebbd2f2b --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-systypes.patch @@ -0,0 +1,11 @@ +--- a/base/third_party/symbolize/symbolize.h ++++ b/base/third_party/symbolize/symbolize.h +@@ -58,6 +58,8 @@ + #include "config.h" + #include "glog/logging.h" + ++#include ++ + #ifdef HAVE_SYMBOLIZE + + #if defined(__ELF__) // defined by gcc diff --git a/srcpkgs/electron33/files/patches/chromium-unbundled-cross-toolchain.patch b/srcpkgs/electron33/files/patches/chromium-unbundled-cross-toolchain.patch new file mode 100644 index 00000000000..c3f2294ac4b --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-unbundled-cross-toolchain.patch @@ -0,0 +1,12 @@ +--- a/build/toolchain/linux/unbundle/BUILD.gn.orig ++++ b/build/toolchain/linux/unbundle/BUILD.gn +@@ -35,7 +35,7 @@ + extra_ldflags = getenv("BUILD_LDFLAGS") + + toolchain_args = { +- current_cpu = current_cpu +- current_os = current_os ++ current_cpu = host_cpu ++ current_os = host_os + } + } diff --git a/srcpkgs/electron33/files/patches/chromium-wasm_canonical_rtts-is-WeakFixedArray-not-List-so-us.patch b/srcpkgs/electron33/files/patches/chromium-wasm_canonical_rtts-is-WeakFixedArray-not-List-so-us.patch new file mode 100644 index 00000000000..0b380a3f2a1 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-wasm_canonical_rtts-is-WeakFixedArray-not-List-so-us.patch @@ -0,0 +1,27 @@ +From 0eb26e623a7382e1c6d3b5ce33f7a304371414cf Mon Sep 17 00:00:00 2001 +From: John +Date: Tue, 15 Oct 2024 22:04:05 +0200 +Subject: [PATCH] wasm_canonical_rtts() is WeakFixedArray not List, so use + lowercase get + +--- + v8/src/wasm/interpreter/wasm-interpreter-runtime.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/v8/src/wasm/interpreter/wasm-interpreter-runtime.cc b/v8/src/wasm/interpreter/wasm-interpreter-runtime.cc +index da9d701..84adddf 100644 +--- a/v8/src/wasm/interpreter/wasm-interpreter-runtime.cc ++++ b/v8/src/wasm/interpreter/wasm-interpreter-runtime.cc +@@ -1868,7 +1868,7 @@ bool WasmInterpreterRuntime::CheckIndirectCallSignature( + + Tagged rtt = Tagged::cast(isolate_->heap() + ->wasm_canonical_rtts() +- ->Get(real_sig_id) +- .GetHeapObject()); ++ ->get(real_sig_id) ++ .GetHeapObjectAssumeWeak()); + Handle formal_rtt = RttCanon(sig_index); + return SubtypeCheck(rtt, *formal_rtt, sig_index); +-- +2.47.0 + diff --git a/srcpkgs/electron33/files/patches/chromium-webrtc-size_t.patch b/srcpkgs/electron33/files/patches/chromium-webrtc-size_t.patch new file mode 100644 index 00000000000..dd46fe14cd2 --- /dev/null +++ b/srcpkgs/electron33/files/patches/chromium-webrtc-size_t.patch @@ -0,0 +1,10 @@ +--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-10 20:42:29.000000000 +0200 ++++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-09-04 12:47:07.014833633 +0200 +@@ -12,6 +12,7 @@ + #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ + + #include ++#include + + namespace webrtc { + diff --git a/srcpkgs/electron33/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron33/files/patches/electron-Build-fixes.patch.patch new file mode 100644 index 00000000000..a98ee020d34 --- /dev/null +++ b/srcpkgs/electron33/files/patches/electron-Build-fixes.patch.patch @@ -0,0 +1,12 @@ +diff --git a/build/npm.gni b/build/npm.gni +index a1987d095..fb33a14c3 100644 +--- a/build/npm.gni ++++ b/build/npm.gni +@@ -35,7 +35,6 @@ template("npm_action") { + if (!defined(deps)) { + deps = [] + } +- deps += [ ":npm_pre_flight_" + target_name ] + + script = "//electron/build/npm-run.py" + args = [ diff --git a/srcpkgs/electron33/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron33/files/patches/electron-exclude-content-test-patches.patch new file mode 100644 index 00000000000..1e0f20e0b0f --- /dev/null +++ b/srcpkgs/electron33/files/patches/electron-exclude-content-test-patches.patch @@ -0,0 +1,10 @@ +--- electron/script/apply_all_patches.py 2024-02-14 19:35:26.000000000 +0100 ++++ - 2024-02-19 12:58:37.818075522 +0100 +@@ -22,6 +22,7 @@ + patch_data=patch_from_dir(patch_dir), + repo=repo, + threeway=THREEWAY, ++ exclude=['third_party/blink/tools/**', 'test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unit tests/**', 'third_party/blink/web_tests/**', '.gitignore'], + ) + + def apply_config(config): diff --git a/srcpkgs/electron33/files/patches/electron-no-need-for-husky.patch b/srcpkgs/electron33/files/patches/electron-no-need-for-husky.patch new file mode 100644 index 00000000000..0b074254c43 --- /dev/null +++ b/srcpkgs/electron33/files/patches/electron-no-need-for-husky.patch @@ -0,0 +1,10 @@ +--- a/package.json 2022-07-06 17:31:50.000000000 +0200 ++++ - 2022-07-08 23:04:43.654812957 +0200 +@@ -98,7 +98,6 @@ + "precommit": "lint-staged", + "preinstall": "node -e 'process.exit(0)'", + "prepack": "check-for-leaks", +- "prepare": "husky install", + "repl": "node ./script/start.js --interactive", + "start": "node ./script/start.js", + "test": "node ./script/spec-runner.js", diff --git a/srcpkgs/electron33/template b/srcpkgs/electron33/template new file mode 100644 index 00000000000..1b08bbe8eca --- /dev/null +++ b/srcpkgs/electron33/template @@ -0,0 +1,499 @@ +# Template file for 'electron33' +pkgname=electron33 +version=33.0.2 +revision=1 +_nodever=20.18.0 +_chromiumver=130.0.6723.59 +archs="x86_64* aarch64*" +create_wrksrc=yes +build_wrksrc="src" +hostmakedepends="$(vopt_if clang "clang18 lld18 llvm18 compiler-rt") + pkg-config perl gperf bison ninja nodejs hwids which git yarn jq + python3 libepoxy-devel libevent-devel libglib-devel rust rust-bindgen" +makedepends="libpng-devel gtk+3-devel nss-devel pciutils-devel + libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel + libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel + libXScrnSaver-devel alsa-lib-devel libdrm-devel + libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel + libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel + libjpeg-turbo-devel libevent-devel json-c-devel minizip-devel jsoncpp-devel + zlib-devel libcap-devel libXdamage-devel fontconfig-devel freetype-devel opus-devel libffi-devel + $(vopt_if sndio sndio-devel) libva-devel libuv-devel c-ares-devel libnotify-devel + $(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel libxshmfence-devel" +short_desc="Cross platform application framework based on web technologies" +maintainer="John " +license="BSD-3-Clause" +homepage="https://electronjs.org" +distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz + https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz + https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz" +checksum="c6d3be16998ee1f92020078e39dd5c7ea98a1222d2f68919b533ef7f507521fa + 90401be8adcd6f580db5c71ea865c97db0e719ba41f406f5869fc7f44bd20e4f + 651bb82f6af18084070893559643759165ce050b5839f830d4cc098130d3ad89" + + +if [ "$XBPS_LIBC" = musl ]; then + hostmakedepends+=" musl-legacy-compat" +fi + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-legacy-compat" +fi + +no_generic_pkgconfig_link=yes +lib32disabled=yes + +build_options="clang libcxx debug vaapi pulseaudio sndio pipewire drumbrake" +build_options_default="clang libcxx vaapi pulseaudio pipewire" +desc_option_clang="Use clang to build" +desc_option_libcxx="Use bundled libc++" +desc_option_debug="Build with debug symbols" +desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire" +desc_option_drumbrake="WebAssembly Interpreter" + +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 + libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel + $(vopt_if pipewire pipewire-devel) opus-devel pango-devel libva-devel + libcurl-devel libXrandr-devel libXcomposite-devel cups-devel + mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel + libavif-devel libaom-devel libdav1d-devel libflac-devel + libdrm-devel libgbm-devel" +fi + +if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then + broken="chromium (v8) can only be cross compiled if word size matches" +fi + +if [ "$CROSS_BUILD" ]; then + case "${XBPS_TARGET_MACHINE}" in + #aarch64*) ;; + *) nocross="chromium can not be cross compiled for this architecture" ;; + esac +fi + +_buildtype=Release + +_setup_clang() { + export CC=clang + export CXX=clang++ + export AR=llvm-ar + export NM=llvm-nm + export CFLAGS="-Wno-unknown-warning-option -fdebug-prefix-map=$wrksrc=." + export CXXFLAGS="-Wno-unknown-warning-option -fdebug-prefix-map=$wrksrc=." + export LDFLAGS="" + export BUILD_CC=clang + export BUILD_CXX=clang++ + export BUILD_AR=llvm-ar + export BUILD_NM=llvm-nm + export BUILD_CFLAGS="-Wno-unknown-warning-option" + export BUILD_CXXFLAGS="-Wno-unknown-warning-option" + if [[ -n "$CROSS_BUILD" ]]; then + CFLAGS+=" --sysroot=${XBPS_CROSS_BASE}" + CXXFLAGS+=" --sysroot=${XBPS_CROSS_BASE}" + LDFLAGS+=" --sysroot=${XBPS_CROSS_BASE}" + if [[ -z "$build_option_libcxx" ]]; then + local gcc_version=$(gcc -dumpversion) + local clang_version=$(clang -dumpversion) + CFLAGS+=" --gcc-toolchain=/usr" + CFLAGS+=" -nostdinc" + CFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include" + CFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include" + CXXFLAGS+=" --gcc-toolchain=/usr" + CXXFLAGS+=" -nostdinc++" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward" + CXXFLAGS+=" -nostdinc" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include" + CXXFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include" + LDFLAGS+=" --gcc-toolchain=/usr" + fi + fi +} + +_setup_toolchain() { + if [ "$build_option_clang" ]; then + _setup_clang + fi +} + +_apply_patch() { + local args="$1" pname="$(basename $2)" + + if [ ! -f ".${pname}_done" ]; then + if [ -f "${2}.args" ]; then + args=$(<"${2}.args") + fi + msg_normal "$pkgver: patching: ${pname}.\n" + patch -N $args -i $2 + touch .${pname}_done + fi +} + +_git_am() { + local pname="$(basename $1)" + + if [ ! -f ".${pname}_done" ]; then + msg_normal "$pkgver: patching: ${pname}.\n" + git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \ + am --exclude "third_party/blink/tools/**" \ + --exclude "test/mjsunit/**" --exclude "content/test/**" \ + --exclude "test/cctest/**" --exclude "test/unittests/**" \ + --exclude "third_party/blink/web_tests/**" \ + --exclude "chrome/test/**" \ + $1 + touch .${pname}_done + fi +} + + +_get_chromium_arch() { + case "$1" in + x86_64*) echo x64 ;; + i686*) echo x86 ;; + arm*) echo arm ;; + aarch64*) echo arm64 ;; + ppc64*) echo ppc64 ;; + ppc*) echo ppc ;; + mipsel*) echo mipsel ;; + mips*) echo mips ;; + *) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;; + esac +} + +post_extract() { + mv chromium-${_chromiumver} src + mkdir -p src/third_party/ + mv node-$_nodever src/third_party/electron_node + mv electron-${version} src/electron +} + +_git_init() { + repopath="$1" + cd "$wrksrc"/"$repopath" + git init -q + git config "gc.auto" 0 + if [ "$repopath" != "src" ]; then + echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore" + fi + git add . + git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \ + commit -q -m "." || true + +} + +post_patch() { + cd $wrksrc + for x in $FILESDIR/patches/*.patch; do + case "${x##*/}" in + electron*.patch) + cd src/electron + _apply_patch -p1 "$x" + cd "$wrksrc";; + esac + done + + # Sigh, electron uses git am... + if [ ! -f ".electron_patches_done" ]; then + mv src/electron/patches/config.json config.json.old + jq 'map(select(.patch_dir | IN("src/electron/patches/Mantle", "src/electron/patches/ReactiveObjC", + "src/electron/patches/squirrel.mac", "src/electron/patches/nan") | not))' \ + config.json.old > src/electron/patches/config.json + + jq -r '.[].repo | select(. != "src/third_party/engflow-reclient-configs")' \ + src/electron/patches/config.json | while read -r repopath; do + _git_init $repopath + done + _git_init src/electron + cd $wrksrc + + for x in $FILESDIR/chromium-upstream-patches/*.patch; do + [ -f $x ] || continue + cd src + _git_am "$x" + cd "$wrksrc" + done + + python3 src/electron/script/apply_all_patches.py src/electron/patches/config.json + touch .electron_patches_done + fi + + for x in $FILESDIR/patches/*; do + case "${x##*/}" in + chromium*.patch) + cd src + _apply_patch -p1 "$x" + cd "$wrksrc";; + esac + done + + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + for x in $FILESDIR/musl-patches/*; do + case "${x##*/}" in + chromium*.patch) + cd src + _apply_patch -p1 "$x" + cd "$wrksrc";; + electron*.patch) + cd src/electron + _apply_patch -p1 "$x" + cd "$wrksrc";; + esac + done + fi + if [ "$build_option_sndio" ]; then + mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd} + cp ${FILESDIR}/sndio-files/sndio_*put.* \ + ${wrksrc}/${build_wrksrc}/media/audio/sndio + cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \ + ${wrksrc}/${build_wrksrc}/media/audio/openbsd + for f in "${FILESDIR}"/sndio-patches/*.patch; do + cd src + _apply_patch -p0 "$f" + cd "$wrksrc" + done + fi + vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + src/tools/generate_shim_headers/generate_shim_headers.py +} + +pre_configure() { + cd "$wrksrc/$build_wrksrc" + + # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion + touch chrome/test/data/webui/i18n_process_css_test.html + # Use the file at run time instead of effectively compiling it in + sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \ + -i services/device/public/cpp/usb/BUILD.gn + + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -sf /usr/bin/node third_party/node/linux/node-linux-x64/bin/ + rm -f third_party/devtools-frontend/src/third_party/esbuild/esbuild + + # compile gn early, so it can be used to generate gni stuff + msg_normal "Bootstrapping GN\n" + CC="clang" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \ + CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS} -Wno-error=redundant-move" \ + CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS} -Wno-error=redundant-move" \ + LDFLAGS="${XBPS_LDFLAGS}" \ + python3 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles + + # reusable system library settings + # libcxx + # snappy System snappy is linked against libstdc++ and not CR libcxx + # ffmpeg + local use_system=" + flac + fontconfig + freetype + libdrm + libevent + libjpeg + libpng + libwebp + libxml + libxslt + opus + " + for _lib in $use_system libjpeg_turbo; do + msg_normal "Removing buildscripts for system provided $_lib\n" + find -type f -path "*third_party/$_lib/*" \ + \! -path "*third_party/$_lib/chromium/*" \ + \! -path "*third_party/$_lib/google/*" \ + \! -path './base/third_party/icu/*' \ + \! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete + done + + + msg_normal "Replacing gn files\n" + python3 build/linux/unbundle/replace_gn_files.py \ + --system-libraries $use_system + third_party/libaddressinput/chromium/tools/update-strings.py + + # Satisfy some scripts that use git describe to figure out the electron version + cd ${wrksrc}/src/electron + git tag -f "v${version}" +} + +do_configure() { + local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})" + local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})" + local conf=() + cd third_party/electron_node + if [ "$CROSS_BUILD" ]; then + conf_args=" --dest-cpu=${target_arch} --cross-compiling" + fi + ./configure --prefix=/usr \ + --shared-zlib \ + --shared-libuv \ + --shared-openssl \ + --shared-cares \ + --openssl-use-def-ca-store \ + --without-npm \ + --without-bundled-v8 \ + ${conf_args} + + cd "$wrksrc/$build_wrksrc"/electron + yarn install --frozen-lockfile + cd "$wrksrc/$build_wrksrc" + + local clang_version="$(clang -dumpversion)" + conf+=( + 'import("//electron/build/args/release.gn")' + "override_electron_version=\"${version}\"" + ) + conf+=( + 'enable_nacl=false' + + 'use_sysroot=false' + + 'host_pkg_config="/usr/bin/pkg-config"' + + "is_clang=$(vopt_if clang true false)" + "use_lld=$(vopt_if clang true false)" + 'clang_use_chrome_plugins=false' + 'clang_base_path="/usr"' + "clang_version=\"${clang_version%%.*}\"" + + "use_custom_libcxx=$(vopt_if libcxx true false)" # https://github.com/llvm/llvm-project/issues/61705 + 'enable_rust=true' + 'rust_sysroot_absolute="/usr"' + 'rust_bindgen_root="/usr"' + "rustc_version=\"$(rustc --version)\"" + + # is_debug makes the build a debug build, changes some things. + # might be useful for real debugging vs just debug symbols. + "is_debug=false" + "blink_symbol_level=$(vopt_if debug 2 0)" + "symbol_level=$(vopt_if debug 2 0)" + + 'icu_use_data_file=true' + + 'enable_widevine=false' + 'enable_hangout_services_extension=true' + + 'use_system_harfbuzz=false' + 'use_system_libffi=true' + + 'use_qt=false' + + 'use_cups=true' + + "use_vaapi=$(vopt_if vaapi true false)" + + "use_pulseaudio=$(vopt_if pulseaudio true false)" + "link_pulseaudio=$(vopt_if pulseaudio true false)" + + "rtc_use_pipewire=$(vopt_if pipewire true false)" + + "use_sndio=$(vopt_if sndio true false)" + + "v8_enable_drumbrake=$(vopt_if drumbrake true false)" + + # Always support proprietary codecs. + # Enable H.264 support in bundled ffmpeg. + 'proprietary_codecs=true' + 'ffmpeg_branding="Chrome"' + 'is_component_ffmpeg=false' + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + 'treat_warnings_as_errors=false' + 'fatal_linker_warnings=false' + + # Save space by removing DLOG and DCHECK messages (about 6% reduction). + # 'logging_like_official_build=true' + 'disable_fieldtrial_testing_config=true' + + 'is_official_build=true' + + # segfaults with llvm-12.0.1 + 'is_cfi=false' + 'use_thin_lto=false' + 'use_cfi_icall=false' + 'chrome_pgo_phase=0' + ) + + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + conf+=( 'is_musl=true' ) + fi + + if [ "$CROSS_BUILD" ]; then + conf+=( + 'custom_toolchain="//build/toolchain/linux/unbundle:default"' + 'host_toolchain="//build/toolchain/linux/unbundle:host"' + 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:v8_snapshot_cross"' + ) + else + conf+=( + 'custom_toolchain="//build/toolchain/linux/unbundle:default"' + 'host_toolchain="//build/toolchain/linux/unbundle:default"' + ) + fi + + conf+=( + "target_cpu=\"$target_arch\"" + "host_cpu=\"$host_arch\"" + ) + + _setup_toolchain + msg_normal "Configuring build\n" + out/$_buildtype/gn gen out/$_buildtype --args="${conf[*]}" +} + +do_build() { + # XXX: need for error: the option `Z` is only accepted on the nightly compiler + export RUSTC_BOOTSTRAP=1 + export CCACHE_SLOPPINESS=include_file_mtime + + _setup_toolchain + msg_normal "Ninja turtles GO!\n" + ninja ${makejobs} -C out/$_buildtype chromium_licenses copy_node_headers version electron +} + +do_install() { + vmkdir /usr/lib/$pkgname + vmkdir /usr/include/$pkgname + + for f in out/$_buildtype/*.bin out/$_buildtype/*.pak out/$_buildtype/icudtl.dat; do + vinstall $f 0644 usr/lib/$pkgname + done + vinstall out/$_buildtype/resources/default_app.asar 0644 usr/lib/$pkgname/resources + + + vcopy out/$_buildtype/locales usr/lib/$pkgname + rm -v ${DESTDIR}/usr/lib/$pkgname/locales/*.pak.info + + vinstall out/$_buildtype/electron 0755 usr/lib/$pkgname + vinstall out/$_buildtype/chrome_crashpad_handler 0755 usr/lib/$pkgname + vinstall out/$_buildtype/libEGL.so 0755 usr/lib/$pkgname + vinstall out/$_buildtype/libGLESv2.so 0755 usr/lib/$pkgname + vinstall out/$_buildtype/libvulkan.so.1 0755 usr/lib/$pkgname + vinstall out/$_buildtype/libvk_swiftshader.so 0755 usr/lib/$pkgname + vinstall out/$_buildtype/vk_swiftshader_icd.json 0644 usr/lib/$pkgname + vinstall out/$_buildtype/version 0644 usr/lib/$pkgname + vinstall out/$_buildtype/LICENSES.chromium.html 0644 usr/lib/$pkgname + + vcopy out/$_buildtype/gen/node_headers usr/include/$pkgname + ln -sv /usr/include/$pkgname/node_headers/include/node ${DESTDIR}/usr/include/$pkgname/node + + vlicense ${wrksrc}/src/LICENSE chromium.LICENSE + vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE + vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE + + vmkdir /usr/bin + ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname +} + +electron33-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + } +} diff --git a/srcpkgs/electron33/update b/srcpkgs/electron33/update new file mode 100644 index 00000000000..3af8e58b535 --- /dev/null +++ b/srcpkgs/electron33/update @@ -0,0 +1,2 @@ +site=https://www.electronjs.org/releases/stable?version=${version%%.*} +pattern='tag/v\K[\d\.]+(?=")' diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template index f269ad008f8..58c07e3b452 100644 --- a/srcpkgs/electrum/template +++ b/srcpkgs/electrum/template @@ -1,14 +1,15 @@ # Template file for 'electrum' pkgname=electrum -version=4.4.6 -revision=2 +version=4.5.8 +revision=1 build_style=python3-module -hostmakedepends="python3-setuptools python3-PyQt5-devel-tools" +hostmakedepends="python3-setuptools python3-pyqt6-devel-tools" depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx - python3-bitstring python3-dnspython python3-ecdsa python3-jsonrpclib - python3-protobuf python3-pyaes python3-pycryptodomex python3-PyQt5 + python3-dnspython python3-ecdsa python3-jsonrpclib python3-Pillow + python3-protobuf python3-pyaes python3-pycryptodomex python3-pyqt6 python3-qrcode python3-socks python3-cryptography libsecp256k1 - python3-certifi libzbar" + python3-async-timeout python3-certifi python3-jsonpatch libzbar + python3-pyqt6-declarative python3-pyqt6-gui python3-pyqt6-network" # Optional dependencies: # btchip - BTChip hardware wallet support # trezor - TREZOR hardware wallet support @@ -21,7 +22,7 @@ license="MIT" homepage="https://electrum.org/" changelog="https://raw.githubusercontent.com/spesmilo/electrum/master/RELEASE-NOTES" distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz" -checksum=8bec8bfcee5c27a47b3c4753dd39692b60face0fc90ef1bcfb8d4c464900c6ab +checksum=84221054e6452ea11d4b80cb4bf6e0c539c57dbff3c414c1a44e5442dc9e1caf post_install() { vsed -i -e 's|electrum %u|electrum|' \ diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch deleted file mode 100644 index 9919c3963c0..00000000000 --- a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/package.json b/package.json -index 02a59ee45..b5dd89a2f 100644 ---- a/package.json -+++ b/package.json -@@ -101,7 +101,6 @@ - "@babel/runtime": "^7.12.5", - "@casualbot/jest-sonar-reporter": "^2.2.5", - "@principalstudio/html-webpack-inject-preload": "^1.2.7", -- "@sentry/webpack-plugin": "^2.0.0", - "@svgr/webpack": "^5.5.0", - "@testing-library/react": "^12.1.5", - "@types/jest": "^29.0.0", -diff --git a/webpack.config.js b/webpack.config.js -index 514bf32d0..a17a561b7 100644 ---- a/webpack.config.js -+++ b/webpack.config.js -@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin"); - const TerserPlugin = require("terser-webpack-plugin"); - const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin"); - const HtmlWebpackInjectPreload = require("@principalstudio/html-webpack-inject-preload"); --const { sentryWebpackPlugin } = require("@sentry/webpack-plugin"); - const crypto = require("crypto"); - - // XXX: mangle Crypto::createHash to replace md4 with sha256, output.hashFunction is insufficient as multiple bits -@@ -658,18 +657,6 @@ module.exports = (env, argv) => { - files: [{ match: /.*Inter.*\.woff2$/ }], - }), - -- // upload to sentry if sentry env is present -- process.env.SENTRY_DSN && -- sentryWebpackPlugin({ -- release: process.env.VERSION, -- sourcemaps: { -- paths: "./webapp/bundles/**", -- }, -- errorHandler: (err, invokeErr, compilation) => { -- compilation.warnings.push("Sentry CLI Plugin: " + err.message); -- console.log(`::warning title=Sentry error::${err.message}`); -- }, -- }), - new webpack.EnvironmentPlugin(["VERSION"]), - ].filter(Boolean), - diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args deleted file mode 100644 index 1f64306266f..00000000000 --- a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args +++ /dev/null @@ -1 +0,0 @@ --Np1 -d element-web diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template index aa187913ebb..81f24c7c5c1 100644 --- a/srcpkgs/element-desktop/template +++ b/srcpkgs/element-desktop/template @@ -1,6 +1,6 @@ # Template file for 'element-desktop' pkgname=element-desktop -version=1.11.43 +version=1.11.83 revision=1 create_wrksrc=yes conf_files="/etc/${pkgname}/config.json" @@ -17,8 +17,8 @@ homepage="https://element.io" changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md" distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz" -checksum="9a090dad94096e57ceb6629f41650fbb70c3efb2d36a7354ec3902463495633e - c7395f14a7747ece79ade9ab1133e95abf9c35c73fa430220e4a5d8868cd5028" +checksum="be20c6cdf5b77bd9ee49bc202611a3e13deed31522e7cf956635ae13112008de + 50cd755c8fb22163f089eeb89b2fc23a7c28d65522565a1e9b0a791aa8829952" export USE_SYSTEM_APP_BUILDER=true @@ -27,15 +27,6 @@ post_extract() { mv ${pkgname/desktop/web}-${version} ${pkgname/desktop/web} } -pre_patch() { - for patch in ${pkgname}_*.patch; do - ln -s ../${patch} ${pkgname} - done - for patch in ${pkgname/desktop/web}_*.patch; do - ln -s ../${patch} ${pkgname/desktop/web} - done -} - post_patch() { cd ${pkgname/desktop/web} # Disable auto-updating @@ -61,6 +52,7 @@ pre_build() { # Build dependencies and alterations for element-desktop cd ../${pkgname} + npm_config_arch=$carch yarn add keytar npm_config_arch=$carch yarn install } diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template index 2862fb29f00..9dfcd3fad1b 100644 --- a/srcpkgs/elvish/template +++ b/srcpkgs/elvish/template @@ -1,17 +1,18 @@ # Template file for 'elvish' pkgname=elvish -version=0.20.1 -revision=2 +version=0.21.0 +revision=1 build_style=go go_import_path="src.elv.sh" go_package="./cmd/elvish" +make_check_args="-skip TestLocation" short_desc="Novel Unix shell" maintainer="Orphaned " license="BSD-2-Clause" homepage="https://elv.sh/" changelog="https://elv.sh/blog/${version}-release-notes.html" distfiles="https://github.com/elves/elvish/archive/v${version}.tar.gz" -checksum=6a6006015f44def98676eaed611702b000d66838c0e76da572d517d9bde5c388 +checksum=3a4b93c3c99fe2f9847de35d64be24e2d4b9c12d429cd9831b4571993a66bb7a register_shell="/bin/elvish" # fix: collect2: fatal error: cannot find 'ld' diff --git a/srcpkgs/embb/template b/srcpkgs/embb/template index d6a239cc337..455918dc30c 100644 --- a/srcpkgs/embb/template +++ b/srcpkgs/embb/template @@ -8,7 +8,7 @@ configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON short_desc="Library for parallel programming of embedded systems" maintainer="Florian Eich " license="BSD-2-Clause" -homepage="https://embb.io/" +homepage="https://github.com/siemens/embb" distfiles="https://github.com/siemens/embb/releases/download/v${version}/embb-${version}.tar.gz" checksum=a392c710df719bbb1513dd9a6835ab9d73494d7355a47f17e818179fea64dcc8 diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index c23350f1d52..ee2c150a01b 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -1,6 +1,6 @@ # Template file for 'ethtool' pkgname=ethtool -version=6.6 +version=6.11 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ license="GPL-2.0-only" homepage="https://www.kernel.org/pub/software/network/ethtool/" changelog="https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/plain/NEWS" distfiles="https://www.kernel.org/pub/software/network/ethtool/ethtool-${version}.tar.xz" -checksum=833a8493cb9cd5809ab59743092d9a38742c282290800e9626407511bbcebf9e +checksum=8d91f5c72ae3f25b7e88d4781279dcb320f71e30058914370b1c574c96b31202 diff --git a/srcpkgs/evtx/template b/srcpkgs/evtx/template index 6051a31fc36..3c2c4eaba26 100644 --- a/srcpkgs/evtx/template +++ b/srcpkgs/evtx/template @@ -1,6 +1,6 @@ # Template file for 'evtx' pkgname=evtx -version=0.8.3 +version=0.8.4 revision=1 build_style=cargo short_desc="Parser for the Windows XML Event Log (EVTX) format" @@ -8,4 +8,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://github.com/omerbenamram/evtx" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=61e12a8fe0e8fe63e625c392e6b137472aaaf25442ec17801926a9c8864dacee +checksum=4273643dbcc5ec25484e393c14fd03e4749868703fc1d3d966e95016637ebd1c diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index d68caf9b3c7..5159ec1ec16 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=12.94 +version=13.03 revision=1 build_style=perl-module short_desc="Reader and rewriter of EXIF information that supports raw files" @@ -9,4 +9,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://exiftool.org/" changelog="https://exiftool.org/history.html" distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz" -checksum=d029485b7aff73e1c4806bbaaf87617dd98c5d2762f1d3a033e0ca926d7484e0 +checksum=0912e1315318889574f355e5832340632c556a14d30711e94d801085ad0a8e4f diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template index c5a6eab6652..23b98ddd4ff 100644 --- a/srcpkgs/expat/template +++ b/srcpkgs/expat/template @@ -1,6 +1,6 @@ # Template file for 'expat' pkgname=expat -version=2.6.3 +version=2.6.4 revision=1 build_style=gnu-configure short_desc="XML parser library written in C" @@ -9,7 +9,7 @@ license="MIT" homepage="https://libexpat.github.io/" changelog="https://raw.githubusercontent.com/libexpat/libexpat/master/expat/Changes" distfiles="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz" -checksum=274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc +checksum=a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee post_install() { vlicense COPYING diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template index c09aaac8ea7..d7f58c927e9 100644 --- a/srcpkgs/extra-cmake-modules/template +++ b/srcpkgs/extra-cmake-modules/template @@ -1,6 +1,6 @@ # Template file for 'extra-cmake-modules' pkgname=extra-cmake-modules -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DBUILD_HTML_DOCS=ON" @@ -12,7 +12,7 @@ maintainer="John " license="BSD-3-Clause" homepage="https://invent.kde.org/frameworks/extra-cmake-modules" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=206e23e05ba8934ac7a275c8fdd3704165f558878d3dbe3299f991473997ccb8 +checksum=d81de82692d3d2bb77110332a65c8266252becc2c3f307ce814990ce5607b8dc python_version=3 do_check() { diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template index 90cb709420a..289e4c4b9e0 100644 --- a/srcpkgs/eza/template +++ b/srcpkgs/eza/template @@ -1,6 +1,6 @@ # Template file for 'eza' pkgname=eza -version=0.20.4 +version=0.20.8 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -12,8 +12,8 @@ homepage="https://eza.rocks" changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md" distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz https://github.com/eza-community/eza/releases/download/v${version}/man-${version}.tar.gz" -checksum="5f25e866521c310d9530b9bbabeb288ad8d9cd208adee79582dde79bdd51c470 - ece6f79aaf4af3b5c47f6bd3b0979eb3183ff4a4f39aeba871bc2595e4365f71" +checksum="10c32537e1c6d8dcd55d60e223dfb127dbec4c969132aeb503b2548213ef8541 + 9f54dd9703d2b4b5b1b542d42e232415826a0b4e4d64f9ccbb0cae90d88b521e" skip_extraction="man-${version}.tar.gz" diff --git a/srcpkgs/factor/template b/srcpkgs/factor/template index 9cf8bfa500a..73b97b5d974 100644 --- a/srcpkgs/factor/template +++ b/srcpkgs/factor/template @@ -1,6 +1,6 @@ # Template file for 'factor' pkgname=factor -version=0.99 +version=0.100 revision=1 archs="i686 x86_64" build_style=gnu-makefile @@ -12,7 +12,7 @@ maintainer="B. Wilson " license="BSD-2-Clause" homepage="https://factorcode.org/" distfiles="https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip" -checksum=f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e +checksum=7a2d71ea6804a0355ed6629fa164860bd46064238da2f00f61f21d0253868bed nostrip_files="a.elf" post_build() { diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index dc3f16d92b5..0bc75f9a86e 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -1,6 +1,6 @@ # Template file for 'falkon' pkgname=falkon -version=24.08.2 +version=24.08.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake" @@ -18,7 +18,7 @@ maintainer="Helmut Pozimski " license="GPL-3.0-or-later" homepage="https://www.falkon.org" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=d7dcd1615cee623255c818458a9d95eac0f20efce3f0039eefacf4620eaef34b +checksum=c5440fda3c59fa593ff6edf614d080b05d653a1f43e83c333f6e6109088c9b97 LDFLAGS="-Wl,--no-fatal-warnings" diff --git a/srcpkgs/fan2go/template b/srcpkgs/fan2go/template new file mode 100644 index 00000000000..3c415b0cf07 --- /dev/null +++ b/srcpkgs/fan2go/template @@ -0,0 +1,19 @@ +# Template file for 'fan2go' +pkgname=fan2go +version=0.9.0 +revision=1 +build_style=go +go_import_path="github.com/markusressel/fan2go" +go_ldflags="-X ${go_import_path}/cmd/global.Version=${version}" +makedepends="libsensors-devel" +short_desc="Dynamic fan speed control daemon" +maintainer="Leah Neukirchen " +license="AGPL-3.0-or-later" +homepage="https://github.com/markusressel/fan2go" +distfiles="https://github.com/markusressel/fan2go/archive/refs/tags/${version}.tar.gz" +checksum=a800923a6373fc380da513b623786e8a8f81edecedb62807f6fdbfab0fd5c792 + +post_install() { + vsconf fan2go.yaml + vlicense LICENSE +} diff --git a/srcpkgs/fastfetch/template b/srcpkgs/fastfetch/template index e6b9b138f26..ce39bd50d99 100644 --- a/srcpkgs/fastfetch/template +++ b/srcpkgs/fastfetch/template @@ -1,6 +1,6 @@ # Template file for 'fastfetch' pkgname=fastfetch -version=2.27.1 +version=2.29.0 revision=1 build_style=cmake configure_args="-DENABLE_SYSTEM_YYJSON=ON" @@ -14,7 +14,7 @@ license="MIT" homepage="https://github.com/fastfetch-cli/fastfetch" changelog="https://github.com/fastfetch-cli/fastfetch/raw/dev/CHANGELOG.md" distfiles="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${version}.tar.gz" -checksum=de12f8cdb52bc1f123aa9b37813f009eeb09f15cbf43b033693c2936716e2626 +checksum=c3fcccf9502e41c76c30e89530820bf1c7719257e5624bfa5fa77e6627ecb602 if [ -n "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTS=ON" diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template index 0441aa1c7c8..b63aa10d933 100644 --- a/srcpkgs/fcft/template +++ b/srcpkgs/fcft/template @@ -1,7 +1,7 @@ # Template file for 'fcft' pkgname=fcft -version=3.1.8 -revision=2 +version=3.1.9 +revision=1 build_style=meson configure_args="-Ddocs=enabled $(vopt_feature textshaping run-shaping)" @@ -15,7 +15,7 @@ license="MIT" homepage="https://codeberg.org/dnkl/fcft" changelog="https://codeberg.org/dnkl/fcft/raw/branch/master/CHANGELOG.md" distfiles="https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz" -checksum=f48c793f354b8be95477e475dde7c98ac9d2628c52ecb42029dc6d20b52d787c +checksum=4b7e3b2ab7e14f532d8a9cb0f2d3b0cdf9d2919b95e6ab8030f7ac87d059c2b6 build_options="textshaping" build_options_default="textshaping" diff --git a/srcpkgs/fend/template b/srcpkgs/fend/template index 00cfbaf67c6..a30fdd3b0ec 100644 --- a/srcpkgs/fend/template +++ b/srcpkgs/fend/template @@ -1,6 +1,6 @@ # Template file for 'fend' pkgname=fend -version=1.5.3 +version=1.5.5 revision=1 build_style=cargo make_install_args="--path cli" @@ -13,8 +13,8 @@ homepage="https://printfn.github.io/fend/" changelog="https://raw.githubusercontent.com/printfn/fend/main/CHANGELOG.md" distfiles="https://github.com/printfn/fend/archive/refs/tags/v${version}.tar.gz https://github.com/printfn/fend/releases/download/v${version}/fend.1>fend_man_${version}" -checksum="b31befe0df562c5626c52d1cef70d272115054fa707debe56ade9e4f2f28a956 - 3f14b3f69ce9c2720070d6548976eeff60f965ab4ffc9a7109982e179a1be85e" +checksum="330ca6ca5fcb4410fe75caeab0d77b0b112a355ec2a5d5848dffb0a7a7a2e7a7 + 65be3b5b9c49fd13bab854eb1ffa9e14ae533d2623bcccedba48e935ecbe0584" skip_extraction="fend_man_${version}" post_install() { diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template index 6b12c0b446b..9b667274652 100644 --- a/srcpkgs/ffmpeg6/template +++ b/srcpkgs/ffmpeg6/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg6 version=6.1.2 -revision=2 +revision=3 hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel @@ -98,6 +98,7 @@ do_configure() { --enable-libbs2b --enable-libvidstab --enable-libdav1d \ --enable-libsrt --enable-librist --enable-libwebp \ --enable-vulkan --enable-libdrm --enable-libsvtav1 \ + --enable-libfreetype --enable-libharfbuzz --enable-libfontconfig \ $(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \ $(vopt_enable vaapi) $(vopt_enable vdpau) \ $(vopt_enable zimg libzimg) \ diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 0bd066dc039..1d2eebf3893 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=131.0 +version=132.0 revision=1 build_style=meta short_desc="Firefox language packs" @@ -141,100 +141,100 @@ _pkgtmpl() { } } -checksum="2f7c9355d22923c697e5b2fd97d5d78ca9015b4faf15dd82ddc7949ac8261a21 - 0476a79733e7f696d3a5601130f57cd1bb7b44831b933017cc7ca1849ba7abce - 0acc73bcd9f87fd33ff9a57cdbe1828f836cd73717761741038db005647f3156 - 27e4329e73e11cfc37044c68eb6927e100217b144b6fea0ac24c4c775184fee4 - fd8ebc3679c4c52662193327242b41228a6e7120d4775ecb306cbff4ef7d4927 - 19799216d64d39e0ca8497c08624177289990a168a2e9f231ba5669eb6b286a8 - cac45634ed79913250de071164be0ec234e3e9f4b297ff88b109bf5861dfc91d - e04c0e43c6ba18370533d1cca193fd4b0dfd27062638baa2031527c4d77cbc45 - 022c132d34febaa28cf6b0510a8187b86b28a598739da9cb7bdc699a608b333c - a13d86604d0d3105fb31040ad3877e5cda1cf1cab8a568ddb699ce5760943d5b - 7cb03e14b27216071b06dc6ff19b96f67b0084d2b3abc6932ccc004d1f91c72f - 1e803d449e0bb656a03c18023cd77ffdc4201fc1949cde8ca98ce943d4b208af - 7b216eb75385ed0eb1cfc864a3ab37986f589a69276e1eb73323b065812ce68b - 420b155e460ff375c50deceedb85747ac957ab0609e577201a9ab84cdb81fb90 - e34c72a0b25296f5f6ea83d382fd7a305c17bcfdb0e66592fc156fbe67177aa7 - 979c1fc11b5ef84ab0a820d7ff0742dc9d507978d433b18094a5d515fcb12151 - 6ee772b71a114146aa7d952fd4fbd7b1af636c60a90bc247c4e8f0741da11536 - 80e71511956c82041224ccad0f6b1bf7cad7e749ebd1564d665c9beda881070e - 16ded0905a4cdd0ecaf87e5ebc6f73ec536117abecb7797f1998ebb01a59ff4d - 7197de8aa8e45b69c04fbbc8951e59805a198533c39144ec1fab3c7ccaf622f6 - 5af9b2cd617046a902e739ed2f2513af68d894973425d87b9d116ae44a389671 - d36ecf31d092998604c0647c7fb4a64981784091d435af9771b3ab2595d757c1 - 1fcbb39033a2af0ef05f38f9ed4d0b50f8cc63a23b4d2da26ea3049dcda60571 - c69175655cca2a2ca70402f98b05710520f40001dd5b5b9015c37df7b2ef8c4d - 80a3b7a7757656fbb818bece48b9bcb8f210c1c6a9eff0a37409ed5cb66be1c7 - d2f628786e3420d8384a2d91451c36d1734abe7b9db43d8e90a533d27b82bbf5 - ec19654a00bef4ef336ec1c5d3d8717c9914e4a323e79ac1ea07497d8c722aed - c717dd48a85eb12b46d278b82f75906856c7d40f9a75d5acc39b9be482b64981 - 26b7946cad5d69040b668afc9b49a9d0024b573f79e5b35d11d496fe96cb4d2f - f40b8a3d1b66bc553a195361878525ecc01ff958ab80d12bec3a1146313d3522 - 89a5631c0f959c7dc54c31bb64d0c0edaeca061692cba9fb24832906b37331d1 - 8f61e61d0c45d38cd50e2382a87e6596597f17e387b4c7aefbd0e6a292897db0 - 74b6a3171bd1016fb84830e3f635972af79d37b0908cc8b879106503313ea7c8 - 6772df26ce7a3dc3317cb3bfb76e65cf46a865fe437e9597f974e754cf7a90e7 - 2363fc447c077d6084d34c4c2f4df0ea37886db9deea177902ec40d7c20487e6 - 63050b796a59601ac30656ec827aa87d0da5434976661fcec9f55e9c5d60d2a2 - 741387917ccb0d3601e5ad5055b1452e900ffdf5453b85c4ed56d40dc21e8904 - 5f9ba09fd6aebb3a34100e286476897f7b7d518af179067a56c5d70b0b91abea - 6703fa6cbf92435b653194418dbb30ba845377b621d06cc15214981f1aaa4c81 - 5eb503081f758c9643dc5a283e8b0d8e23fe9e2fa4c3675b70fbc77078c61122 - bae26c51bac9b5c4769c5becbc7fd005f6c4693994e1c1632f1963b885b8d5d6 - 5e69825ec9affe3423b376ee1f1c590bfc7b3549679b0f311abc08a88782681d - bfd66b12d0f61a91dab776171d60139e89187abf836fb668d7327ba0d7bc2d94 - bb6139352d582ffd619e31d65d7d4d5f3d8b91452e9d0b129d02187ca779c1d5 - 0663f415b3c7d6bb432dad6b951e94b5c1ed27be50e9a42b779a85da2a21a221 - 80732a656e51ed41a0c2583a6b3386413c65ac96e3bab40d93a767c910efbf9f - 414b62e72d443cc0a0905a938fefd7fdcdf7967253240fc80a5b3d8f247b65cb - 62280249db944aa375342b6e6728a40ee264bf472eb6a78bb5e8880666f6bb31 - 60590607201036a0f96bac0e8791c859d61535e4cdf7d814abc3977da3817e02 - 64f7be6c5b9d379e5da0646a941a9dfa0c4a377f9981cce572d8596f3b685ce8 - e7b0f7840ba9644f294f8651c0252fe3d3d3412906aeba207b3f56556dbe7e98 - 895e58a3aa4aae27fbf57e357e57632664c5678b4e1815b0aea07a85a52e6300 - 1403a73d3b3336b45d6f9191534e338ab8f344f19961aab862efc4691963d140 - 3f8ff228be01cbaa7144c992e2123d333a2e3d7156e8fc89b7c3389701d6ad47 - d34714c2aed50601bb2c17336145a00bcc2c91cb53671dfd6f7ed80d993ef5a0 - 796960f28c89d6c4fe7aff58b8d05bdc778e7452938ed70348a3e441f5c14247 - 0ab52fac2a6927e344e669c40536d4f12bb6e2bfe98078d6ccd233a4a6fb1aab - a4506ebd7cc78f2f46b2da636fe5c08f2528234ca2c235197bc5f325d86c704c - 1846d8a44cba655886b2a4c4bcd907fcec30f10a6410b12d285ef43b93d9b305 - a76d5fffa75bd629128ef8ad61b7c0b6d3a6cb37b22e61e9580f0cbef05d8736 - 18cd07621f116f037c38e4efe6b7ccdb30e051e0ce8df35cd225002b8602778d - c9dcdb016a08420e7883eca568a6337fa23917cbcc6d867c946f38fa7e20875e - bd541452a29fa10188ca2004c5aba5b880fea5398ca92d5a0857d435d3bc489a - 707a2708f3b9ec3b6427df0846353f97d642564fc3f37e887cbae3612ab24c94 - dd338faf603932b9653fc89a18d7c84d4ad14e2d2d267c2d7b18d14fc6bdcb78 - b40ca1b0abcae523496dc8e9b7c7ff873c412c1a75e60322eb615ef8bffbb39a - 4f61ee56aa1f5d899e6fde6583830c8ad06e454e2f41307086b14908796b98db - 78dbd63387fa0b4a74b914d1e3c165aaf56734cdc65afd05ac5abea2165559ff - 91959c34dc34db3b996d6f0e25d3157b1a67840de7e9f40973ed40245ea1bf71 - dd80165636130dffa57b51a9385158d2700c554b4d8931261001782d7c0d6a48 - cc38af64586e927036940c705412eda684035feee68eca33ed01c35bc14c95db - 7e8b78260f07511350bbab66d0f2100e603705ab6dbef81e112d185b84f9aeb5 - 8407a5d10fb131aaf9eb050062b653a602bddd68ca745f6170149373ff9a0507 - 81d8ea4dbd07707b8e66726f4499105939af0fb9c2f0f79b2cb2801db805bb46 - b250023f63d87aed528530af1ee5b25a7088d0c730f4b77ec036ecc090125ea0 - c7bca97b5ad3ed6a3094e787b38912363fbd79fab72b596a79759f8fa983bc57 - 877bb5d06b20d303965354e67ac874638d3ad53bd4a94a1e9ec70f272e9658da - e339ebf8c49b8655c421dfaa8340fa2a7f71888500e1be0ed3a7a546b267bfe4 - 6dd95b4fcf52af161548a333dc5fbfcb7565900daa93898942d9780d7c0c5951 - ab762b5ce55cbf3a1a0b318d92f46efcdbe5ace1007c1d233da6fbb34ef7bf1a - 340736924bdbf825ab7c6e8180047034c4e3a1de2c89c16946f63e5145d13a0c - f1cc3e2e1c126ab613e06409c74c2ea5763de6f30484122cd9a1d5abd7de8498 - 80f3109aa8cbfedf404bef0c500a1953b3f6a4af0068913e61de5cc9d1434248 - 96e6461a90e96a7d82816c34edb5771e2ff858c9eeb833a688f5b973a7e773ec - 9128528adddb0f1288422ae7986c5002a53e117c031f47e4ec6b1f410cd04c1f - 51f9abeb306b5831dbd104482ea241a7b7bfa07f4137a84400ed561e51a82e94 - 09d3e8b4ed8e33436296526188fef706bd454a62e536c5b89c4a6db0368a36c8 - 4a241c68ba8e661a9c4c0ebdb5d17fb689b3cceac0ab8dd3a24679b9e2700672 - 9b919ab3c7d484585e6278a6674c96e8a883bd67de7627757e0959be49fc8f3b - bcb2a920598f2b2fc21f7d731f929526b89424a267d2b150a436b2f775cbb97e - 8fb6f9caacfcac9627d68fde60fa399132850c197bd27375350b7186a4588804 - 3f581c7e434f2a015cbd70f5fa291e5c0a473c3049910ad4846d7023c32bc2dc - 25e48226aa815c2e0496d305eaf218a2608819459e5e5473fba12072e8b42dc6 - d18fa49c39eafb2008ce4568e416ddf90951f18abbaa4fe3b44f9ae88be13c91 - 71fc24d5bcf407373c9a7e74c20f090fd1a09afc55cc235eaa08a8e2a817f7fa - 7e37450b571773347df757dff14f173b8bc522d5463d6f4d32b9215d9870ef53 - 0058098822763915214707c64ca7f17e9242d4b5005bd53bf6a3909dc869d7a4" +checksum="195da335a6f6f8473cdeaec807ec1b2c2cf549f241b01f30a828b8271ff15564 + 38a33738216da3bd3ba0d82f8f8c0880ee0e8d5dd39e6e65c0e8cb17ce6d2dc3 + 6c57857c6e4a972070d5644ea22ee232d6c289313b5c8a6a9ccbdfb3f18c063c + bd4631147eb89f0c01f786d86ba0ed7250b0616ba6c1d993bab492b22800c20c + 9a5ed10edb3f5d4cba487443529575714a783aefce718ba4131010cdd11c3047 + 7dfd2f47e9506eb4c636e3153d64ec774b81502a1a23355101d10124cc44c912 + 362e76f323170da7b956cc6fc23f9f74a0e4ae10290990c8e8c1023c7e4cf72f + 0ea3ffde9ef7e2967f576f807c48ed42d2fb6126a4be7913ff5d3bb819bdb1c5 + 3483285f725a24c9b19356194982149b38edbcee28e0b959329dac7fd628a526 + 5baa9d520735e4def403bbc5765b92e128d697fc3535d4d3c40c4ec12f369dbf + 26a715ce7f68fc68322a98fffce71a3ac6fe08e891b08589ebab63397313ad71 + 3beb903f604e0620421971d21adb9532ed79117b6466b01940a8a942b09e79dd + 5c9b5b23a979647ac912f532419405777488d64efea64137a3f22a28a26b2f53 + 66a2dbc7cfcfff00e437f9cdb38ddcc4569e4372d5c2faa37691519e4dfd02c4 + 4a7f7709189f47861b0a508046f89707157b98278a66abc2389afdfa7998d68b + 97287bfdb27f865f917b93daa62425f57e44df14c30df865abee42e75895e78a + 394b837a3fec05cedd13be23091a1d125d4fc5e33fe50173975dae7720007f97 + 455ac5dfeba7a456b61cc8e7a2c1eabf7bdefde88583157bd45654760e15be00 + ec26c66fc7bcfa21e52b8907e7d502cd74fbc561427ee6d1598dffd2dfe34f6f + 16dac63ac15202fed0a352e0987ef33cde6c1dc464ded6e5469939f7bce46360 + 661747d2bbd2f1329a510df9aff8f41351a0a883fc7f7dd27175a2d08735b840 + 0beb63a999988531e789785243baa1cfbb003610e26187e06de37fa19c424a5b + 4c18aef6a040012dfffa739ee915fb83ee64f2ecd60170c4d3c09cde9efda84d + 6189a9671a253a55fd2eb1ba4d0cc380aea9167174b110fde0158f824f19188a + b215c85572ccc9a8a71c42658d181cb292226ef5b151b97364273c430ae65e99 + c57155d11574d941e4d919155d632898095641df853beb0337760b056fd7b852 + 61491d0e3ce9e6920dfa790f6ae87c0cdbea326f83057f692e7f599ed3fd4bdb + e7a5774a22d5c8b0f59a16211c2ed8d588f47fd9bb6e33d17489e1aa3a65340d + 1acdccda6a81094dbb87a9f10e7a8a38c391db52749b8e95a625f5dc1d93fef9 + 1ef9aead340314401dc11514befcc88474e0e4ad353cf827e08cf1c6a1a9efbf + 7f1bd4edfc19bfd152a89c91e806ed3b1f1fd4af8bb9f94e5474549f90165787 + 3cf98e3b9950030048e9fa2886fb5bf10af0f0613d303a8e679dc2df9e01453f + f1abfcf595334cfaa0638478d3d714ce1037d4068c1e67dec9786d7eca6bec6e + 023e262b7d4a62a6ecd5bcfded0eb8635b2edfda37dba73a7752669fdd02d2e4 + b39b8806cf09a2b86ef7682f1c59ebceed7c6a2209d1e09ce9233f2d13d27025 + 79d8cf638ac93f8a2bf6b942618671670a031a58b2f55bfe97c28b03645ef236 + 75fd3561792b11933d17af1ce3f6d38496c1850f8b97516d121dac6b4c9158a1 + 613cd440ab31500df12232b0c932d8d700efedf7dab989c573599d26c806a3e0 + a36f19674115463038867058cbc899f6c903ee57366e9a0ab2707ae85517d62d + 70d93ca45cff40bf553686704cae87a46ae421b0f183d93964f16c9807506f3e + 2f40b734cf33176d5c526c31160a614cefdec645afa266f124e5cb4b9c315259 + a38bc51e583e606e22a3c68b3bd200d97e63e6e2266a6346155a44d747596738 + 39c7a566401d0b5bdc3cfa7f759386c5fd4534f7ed952b46a857e4269b2d6cea + c3d43a4d082146dbbdb418320813c1562edbc3269183ceeca23a01903e04f83f + 69008cbf47ca9b95d79f88f0dde6c7fc18e8bff650677cbc06dc020b22c13788 + d98700ad9661ddc0aa618bb7e18c634b1afe1c326013b7518202ada95f64c152 + 5b599bc3c664e96caaa3fbaff543a6f464648ec7367954904da0155dcf709378 + 3c332696bc700a9fd6b90ff6b5062459b3d64edb06ac912aa598142dd3b5a7ef + d451d68f66cd6f5ae6a46d5211305760bab505488906a615e433848023f0ee1c + 31707dcd3bac6f567f79f920d27ee48efe30552c8983fa4222673febb326e797 + ab0f43f8dd844fd85cd055d4dee2c89ea9432ec24473af986ecd2512b08d2721 + 1612a96ff7e2002bde67427ee673e4dc0da420396626a78d981cc6b64d7aa665 + 28375fc67fb133322c8aa95142fec3dc846b44e20170d37923091b33f1a10fb9 + a65c4be8c5164c8f6c505589a94870726455909fd6268f55b98659b2aba55ec0 + 942cb22d1872923c4b8e5206d572deebacb686c9e9360234c828dd51aadcaf72 + 0a8a03ad6f86f1db6699bce343a06f02f2540490143b0413c0d2297106106a1a + 7cffb14f70c12da80e348ffc76ec191d4b2e67854b24f5742a8ab1f827171a85 + d6eb3834afdd27d790c6ab741200495e7aa325cf8d77d291c513981fa423c828 + c45811361281b8e6706579d1d8aa3b380e472c7117f99343ef5c2d598f0c15cb + 27831f859a971c85c03e51b4da7fef1d8d65959ffc5bb546e1cbae6a325a2944 + dd6e5a12792ef4f4d26e27e60d1250e41c407a70eb9a388beb17c60ed74765b8 + 3ac83a0d01a5557fbc078be66ed98332b02846d6ad929e020677eb0ec73fc1d2 + 4ccdcb85688bcd2979bc37c7d2bc29ddb57cda868e354846d6d1aa60ebef3a8c + 0d9b6f102e371bb476ad233c0d4927ef34134a866f2e74f11d9d900ad55ed3d8 + 15bbed901189f87aef46f18830e2f4b150c6267dba2782fcc690d19c69fcbf00 + f028cbcbf52deed2704c19115d5cd6f8e0690ebb191dfe2e37a78726377c0fd5 + 09f42d48525181b5e29715f0aafb3e9ab261843791ff1cda0a810d5569754df4 + 211a5c5b69e4cfb7f4b1a2a6015a897426d8e64821c08625835a631fa5231b9a + 1df766693c5a2f37d19338aff5074a7239fa07ebfcf6a615da3498390791bd26 + 465a1b93ee9a6b2d7457667d7b719319ce33c9d9623104ff946509389d9285cd + 67ea02d25462280e5396841ea9983040cfc251c0f54bdbf34898ea054810fda8 + c2a2fa4d8c440c56816961e36ed5c990bdd2aa4f2d870c574f4be7d54272f46e + 69f96041d818ee1d737349a69ad069f16793700f39c376f3bf256b4dcde3001b + 4dfde35b72365a0aeb6641c8306ee864c249eaa8f5d273c9654cbd98dc5636da + 6c0da664a3e43581231e32be4013315afacb2cbd3126d5d2d499c00b7a5adcdc + 6d8dae091a1cf15ffaf7067b08c74b9e962ad7dca6981449ed74270782f0bd0b + 24892012367bb1b694e7d33503a117a233d64f4db8bf5421386df130341c4833 + 07159e9a5c87cf212a6e24efdbda75efe102b61e0f099047394da576bc28a95e + f4f924c119e40b8f3463f92149afb6ab1e1264e24b415b37a9c2452a5daf2724 + 028cb7bf4d05409b9eda58538237965ec2489e31fe22d6d012d44b0ebb00632d + ad87b3cf5cfca4edee1e6ba695538282a11271c7a9e84ada1cc5e1f8e741d183 + 92d11da5ef5de1cf7aa3a471f36ce63c85278580584f9e7f12f35c8a6a05fa61 + f4551f336e6ea271b87f2de7c328ad0dd68a658c0ffc93a5c16d598dc2fd929e + 94ed283f464a36b6e3652847cbe44da8d491d706bdf808298aa3c35eeb98dd1a + 7ec63cdb37af0123ebcbd08ba6ec5b33435c556576c1651d94d22b5d7b96b9c6 + f3fbfe9df6f6a1794ffc9ad0fc906a22c96e9e0e4d21ec18c48fb3963d636899 + 101b697f71c6852a32b172fd58a0fa447a73c75099bfd61a32d1c5a6d6703086 + eac145ada3e2c63e7de217662c93cd14af5db5fff9db4eb9cb624b02f98c0681 + 3f111a4ea6d3795b80d80c5dbe04e5af188af71ffd96d230d270e9bd53e37d12 + d60edaf1440418911ffd26ba02c2abb152860aaeb11b56d62ba07a783ba2105a + 9c544f08ce8d7c730611b6cace1ee22721f737e19f3f426d2d5437d4c427b161 + f511482d0df00654efd0090facf3c720b4c3884282c7d3cc8b9cc8d679cc2bd2 + cc9f2aef0c2d1019982ebcb0f61fae815b0a512c724f3092351aaee32cf77b62 + e8bc969291049d1e92df406904b6a799eb731a100e158a109c3491c68bf7da8a + d2c56214bfa356985701d78f3ad3c41b993ab18a4da85f07cdaa4c5e2abb0ca9 + 4a0c3c67d8a62d7c83cadec06abf5b1fef8c9d578a4c3ce2ee1bafbfd85a400e + 1e4d2f30f7e52e5432c0d6bd6603821de91a04bc7e4d56b84cd77746ccec291d" diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index b6f8e1c2ca2..2ccac1dabbe 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=131.0.3 +version=132.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/firefox/releases/${version/beta/b}/source/firefox-${version/beta/b}.source.tar.xz" -checksum=7a7df3f97737453efaa243ca9dbaf95d0f0f833c5dc8afacb5704ee16ef060d0 +checksum=8908b144895b354460c6975291b75ea804b07bf9bb0ee386eafeaf3c82c55c7e lib32disabled=yes diff --git a/srcpkgs/flang19 b/srcpkgs/flang19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/flang19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/flang19-devel b/srcpkgs/flang19-devel new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/flang19-devel @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template index 76325b88951..659835de6d4 100644 --- a/srcpkgs/flannel/template +++ b/srcpkgs/flannel/template @@ -1,6 +1,6 @@ # Template file for 'flannel' pkgname=flannel -version=0.25.7 +version=0.26.1 revision=1 build_style=go go_mod_mode=off @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/flannel-io/flannel" distfiles="https://github.com/flannel-io/flannel/archive/v${version}.tar.gz" -checksum=894eb6b91a44c0447c46369e83d6862608118025ad50990ddc8b1f99a5f5d9f1 +checksum=31a8fbd17dabf47d8f07ceb7f98bb512347dd47a57af7051a02b8fda2e5bee46 post_install() { vsv flannel diff --git a/srcpkgs/flashrom-devel b/srcpkgs/flashrom-devel new file mode 120000 index 00000000000..183c7f43a41 --- /dev/null +++ b/srcpkgs/flashrom-devel @@ -0,0 +1 @@ +flashrom \ No newline at end of file diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template index 849ffa47b68..889d883e0f5 100644 --- a/srcpkgs/flashrom/template +++ b/srcpkgs/flashrom/template @@ -1,17 +1,30 @@ # Template file for 'flashrom' pkgname=flashrom -version=1.3.0 +version=1.4.0 revision=1 -build_style=gnu-makefile -hostmakedepends="pkg-config" -makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel" +build_style=meson +configure_args="-Duse_internal_dmi=false -Ddocumentation=enabled" +hostmakedepends="pkg-config python3-Sphinx" +makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel libjaylink-devel" +depends="dmidecode" short_desc="Utility for reading, writing, erasing and verifying flash ROM chips" maintainer="Orphaned " license="GPL-2.0-only" homepage="https://www.flashrom.org" distfiles=https://github.com/flashrom/flashrom/archive/v$version.tar.gz -checksum=91d3ae239e435682561966350d00890b8bf5ae1a947af1f647198aa391196890 +checksum=b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c +make_check=no # can't run without special setup..? -post_patch() { - vsed -i 's/sbin/bin/' Makefile +flashrom-devel_package() { + depends="${sourcepkg}>=${version}_${revision} pciutils-devel + libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel + libjaylink-devel python3-Sphinx" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + vmove usr/share/doc + } } diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template index ceaafce85e1..1d8f1dcbfc0 100644 --- a/srcpkgs/font-iosevka/template +++ b/srcpkgs/font-iosevka/template @@ -1,6 +1,6 @@ # Template file for 'font-iosevka' pkgname=font-iosevka -version=31.6.1 +version=32.0.1 revision=1 depends="font-util" short_desc="Slender monospace sans-serif and slab-serif typeface" @@ -10,8 +10,8 @@ homepage="https://typeof.net/Iosevka/" changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md" distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/SuperTTC-Iosevka-${version}.zip https://github.com/be5invis/Iosevka/releases/download/v${version}/SuperTTC-IosevkaSlab-${version}.zip" -checksum="6ba820a01f0dd5fe282f3132cb5474042a5a75cb21a876c0c4d96996bd8118ad - 36ff34e8fd2240f3bac047c84794d0076eb4d00afe4dd5664536662fdcbca8ea" +checksum="46751fddd9ea49ccb8c49c1f4d246fd2c78f4b68aa9850967db872cce783c0d3 + 60523ae1ae4a721fe42c7665d4e4c3e0e34d9fa5653d3b8af48da2d3daf8eddf" font_dirs="/usr/share/fonts/TTF" diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template index 1cd7980fe3e..b49b35b78c9 100644 --- a/srcpkgs/font-sarasa-gothic/template +++ b/srcpkgs/font-sarasa-gothic/template @@ -1,6 +1,6 @@ # Template file for 'font-sarasa-gothic' pkgname=font-sarasa-gothic -version=1.0.22 +version=1.0.24 revision=1 depends="font-util" short_desc="CJK programming font based on Iosevka and Source Han Sans" @@ -8,7 +8,7 @@ maintainer="B. Wilson " license="OFL-1.1" homepage="https://github.com/be5invis/Sarasa-Gothic" distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/Sarasa-TTC-${version}.7z" -checksum=d6f1264862f61a906df9cde564d637e82dc480fd08d0b6236320fccc69ec491e +checksum=0eafa69236cfeba81aebbcebe5b8efaf89bb6b942c6f958b68ae95937068053b font_dirs="/usr/share/fonts/TTF" do_install() { diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index 49d89157839..c9d2104d3c4 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.18.1 +version=1.19.0 revision=1 build_style=meson hostmakedepends="pkg-config scdoc wayland-devel" @@ -13,7 +13,7 @@ license="MIT" homepage="https://codeberg.org/dnkl/foot" changelog="https://codeberg.org/dnkl/foot/raw/branch/master/CHANGELOG.md" distfiles="https://codeberg.org/dnkl/foot/archive/${version}.tar.gz" -checksum=59d22187f7ceaaaa570a5299b102e8f4692826e98785f89ad9d8911802ccc000 +checksum=148b0b545ca37e15b877ff9f6a768a4ce6feb0ed256f8a5f853cb2e16e3323c1 conf_files="/etc/xdg/foot/foot.ini" post_install() { diff --git a/srcpkgs/freeciv-qt6 b/srcpkgs/freeciv-qt6 new file mode 120000 index 00000000000..5c9f356a808 --- /dev/null +++ b/srcpkgs/freeciv-qt6 @@ -0,0 +1 @@ +freeciv \ No newline at end of file diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template index 827b30f5e11..833b45f44b3 100644 --- a/srcpkgs/freeciv/template +++ b/srcpkgs/freeciv/template @@ -1,10 +1,10 @@ # Template file for 'freeciv' pkgname=freeciv -version=3.0.7 -revision=2 +version=3.1.3 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config gettext" makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel gtk+3-devel libcurl-devel lua53-devel" short_desc="Free and Open Source empire-building strategy game - server/data" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://www.freeciv.org/" changelog="https://www.freeciv.org/wiki/NEWS" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=f6e606f17ed03d971272883f1a4879f5c1c2c247f64b8edefa6a25c8a2a8dac4 +checksum=741086fa94574374c7c27480f77ee68e5b538bfb2eff85004fa8c87b312c7f2f nopie_files="/usr/bin/freeciv-ruledit" # gtk3.22 is a client supporting gtk+>=3.22 @@ -21,8 +21,8 @@ _clients="gtk3.22,sdl2" subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw" if [ -z "$CROSS_BUILD" ]; then _clients+=",qt" - makedepends+=" qt5-devel" - subpackages+=" freeciv-qt5" + makedepends+=" qt6-base-devel" + subpackages+=" freeciv-qt5 freeciv-qt6" fi configure_args+=" --enable-client=${_clients}" @@ -46,15 +46,9 @@ freeciv-gtk3_package() { } } freeciv-qt5_package() { - short_desc="Free and Open Source empire-building strategy game - Qt5 client" - depends="${sourcepkg}>=${version}_${revision}" - nopie_files="/usr/bin/freeciv-mp-qt" - pkg_install() { - vmove "usr/bin/*qt*" - vmove "usr/share/metainfo/*qt*" - vmove "usr/share/man/man6/*qt*" - vmove "usr/share/applications/*qt*" - } + build_style=meta + short_desc="Freeciv - Qt5 client (transitional dummy package)" + depends="freeciv-qt6>=${version}_${revision}" } freeciv-sdl_package() { short_desc="Free and Open Source empire-building strategy game - SDL2 client" @@ -71,3 +65,15 @@ freeciv-xaw_package() { short_desc="Freeciv GTK+3 client (transitional dummy package)" depends="freeciv-gtk3>=${version}_${revision}" } + +freeciv-qt6_package() { + short_desc="Free and Open Source empire-building strategy game - Qt6 client" + depends="${sourcepkg}>=${version}_${revision}" + nopie_files="/usr/bin/freeciv-mp-qt" + pkg_install() { + vmove "usr/bin/*qt*" + vmove "usr/share/metainfo/*qt*" + vmove "usr/share/man/man6/*qt*" + vmove "usr/share/applications/*qt*" + } +} diff --git a/srcpkgs/freerdp3/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch index 37bef15c804..d7d5b8cfe5c 100644 --- a/srcpkgs/freerdp3/patches/fix-cross.patch +++ b/srcpkgs/freerdp3/patches/fix-cross.patch @@ -1,27 +1,27 @@ -help cmake run executables when cross-compiling -diff --git a/client/SDL/common/res/CMakeLists.txt b/client/SDL/common/res/CMakeLists.txt -index fdb80b79b..08f922968 100644 ---- a/client/SDL/common/res/CMakeLists.txt -+++ b/client/SDL/common/res/CMakeLists.txt -@@ -51,7 +51,7 @@ list(APPEND FACTORY_CLASSES - add_custom_command( - OUTPUT ${FILE_BYPRODUCTS} - COMMAND ${CMAKE_COMMAND} -E make_directory ${FILE_BIN_DIR} -- COMMAND $ ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR} -+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $ ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR} - COMMENT "create image resources" - DEPENDS sdl-common-res2bin - DEPENDS ${FILE} -diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake -index 758d673d6..a00cdf5eb 100644 ---- a/cmake/InstallFreeRDPMan.cmake -+++ b/cmake/InstallFreeRDPMan.cmake -@@ -54,7 +54,7 @@ function(generate_and_install_freerdp_man_from_xml target section dependencies) +diff --git a/client/common/man/CMakeLists.txt b/client/common/man/CMakeLists.txt +index 798957c78..c14d22319 100644 +--- a/client/common/man/CMakeLists.txt ++++ b/client/common/man/CMakeLists.txt +@@ -1,6 +1,3 @@ +-if(CMAKE_CROSSCOMPILING) +- find_package(GenerateArgumentManpage) +-else() + include_directories(${CMAKE_BINARY_DIR}/include/) - add_custom_command( - OUTPUT "${manpage}" -- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook -+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook - COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS + add_executable(generate_argument_manpage +@@ -9,14 +6,13 @@ else() + ) + export(TARGETS generate_argument_manpage FILE + "${CMAKE_BINARY_DIR}/GenerateArgumentManpageConfig.cmake") +-endif() + + set(MAN_OPTIONS_FILE "${CMAKE_CURRENT_BINARY_DIR}/freerdp-global-options.1") + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${MAN_OPTIONS_FILE}) + + add_custom_command( + OUTPUT ${MAN_OPTIONS_FILE} +- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_manpage "${MAN_OPTIONS_FILE}" ++ COMMAND generate_argument_manpage "${MAN_OPTIONS_FILE}" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS + generate_argument_manpage diff --git a/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch b/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch deleted file mode 100644 index 34bed655824..00000000000 --- a/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch +++ /dev/null @@ -1,43 +0,0 @@ -undo commit '[cmake] fix cross compilation' because it requires native tools -https://github.com/FreeRDP/FreeRDP/commit/46bced61fb2f76d71b737349c851b8f9924278d5 -diff --git a/client/SDL/common/res/CMakeLists.txt b/client/SDL/common/res/CMakeLists.txt -index fdb80b79b..44edf0553 100644 ---- a/client/SDL/common/res/CMakeLists.txt -+++ b/client/SDL/common/res/CMakeLists.txt -@@ -15,16 +15,9 @@ - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. --if(CMAKE_CROSSCOMPILING) -- find_package(SdlCommonRes2bin) --else() -- add_executable(sdl-common-res2bin -- convert_res_to_c.cpp -- ) -- export(TARGETS sdl-common-res2bin FILE -- "${CMAKE_BINARY_DIR}/SdlCommonRes2binConfig.cmake") --endif() -- -+add_executable(sdl-common-res2bin -+ convert_res_to_c.cpp -+) - - set(FACTORY_SRCS "") - set(FACTORY_HDR "") -diff --git a/client/common/man/CMakeLists.txt b/client/common/man/CMakeLists.txt -index a611cc22e..b601f1dfd 100644 ---- a/client/common/man/CMakeLists.txt -+++ b/client/common/man/CMakeLists.txt -@@ -1,9 +1,3 @@ --if(CMAKE_CROSSCOMPILING) -- find_package(GenerateArgumentDocbook) --else() -- add_executable(generate_argument_docbook -- generate_argument_docbook.c -- ) -- export(TARGETS generate_argument_docbook FILE -- "${CMAKE_BINARY_DIR}/GenerateArgumentDocbookConfig.cmake") --endif() -+add_executable(generate_argument_docbook -+ generate_argument_docbook.c -+) diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template index 9cf486203f2..41fbe1551f4 100644 --- a/srcpkgs/freerdp3/template +++ b/srcpkgs/freerdp3/template @@ -1,13 +1,13 @@ # Template file for 'freerdp3' pkgname=freerdp3 -version=3.8.0 +version=3.9.0 revision=1 build_style=cmake build_helper=qemu -configure_args="-DCHANNEL_URBDRC_CLIENT=ON -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook +configure_args="-DCHANNEL_URBDRC_CLIENT=ON -DPKG_CONFIG_RELOCATABLE=OFF -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins -DRDTK_FORCE_STATIC_BUILD=ON -DWAYLAND_SCANNER=/usr/bin/wayland-scanner - -DWITH_BINARY_VERSIONING=ON -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc + -DWITH_BINARY_VERSIONING=ON -DWITH_ALSA=ON -DWITH_CHANNELS=ON -DWITH_CLIENT_CHANNELS=ON -DWITH_CUPS=ON -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON -DWITH_FUSE=ON -DWITH_GSTREAMER_1_0=OFF -DWITH_ICU=ON -DWITH_JPEG=ON -DWITH_LIBSYSTEMD=OFF -DWITH_PULSE=ON -DWITH_SAMPLE=OFF @@ -20,7 +20,7 @@ configure_args="-DCHANNEL_URBDRC_CLIENT=ON -DDOCBOOKXSL_DIR=/usr/share/xsl/docbo -DWITH_PKCS11=$(vopt_if smartcard ON OFF) -DWITH_SWSCALE=$(vopt_if ffmpeg ON OFF) -DWITH_WAYLAND=$(vopt_if wayland ON OFF) -DWITH_WEBVIEW=$(vopt_if webview ON OFF) -DWITH_CLIENT_SDL_VERSIONED=$(vopt_if sdl2 ON OFF)" -hostmakedepends="pkg-config xmlto $(vopt_if wayland wayland-devel)" +hostmakedepends="pkg-config $(vopt_if wayland wayland-devel)" makedepends="alsa-lib-devel cups-devel fuse3-devel icu-devel libXcursor-devel libXdamage-devel libXinerama-devel libXrandr-devel libXv-devel libjpeg-turbo-devel libusb-devel libxkbfile-devel mit-krb5-devel openssl-devel @@ -35,7 +35,7 @@ license="Apache-2.0" homepage="https://www.freerdp.com/" changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz" -checksum=e313934a77a0bcca3af803455dd9ea1aa2f657c598e3397325aa48e6effd450d +checksum=a1d2946c67037bf6bb8aa2f0441c7cacd5e92c835d776cecffb4fcdbaa45ec4f CFLAGS="-Wno-dev" # wayland - deprecated, sdl2 - experimental diff --git a/srcpkgs/fuse-9pfs/template b/srcpkgs/fuse-9pfs/template index 27b590cc4fc..42701eda1b7 100644 --- a/srcpkgs/fuse-9pfs/template +++ b/srcpkgs/fuse-9pfs/template @@ -1,6 +1,6 @@ # Template file for 'fuse-9pfs' pkgname=fuse-9pfs -version=0.3 +version=0.4 revision=1 build_style=gnu-makefile make_use_env=yes @@ -11,7 +11,7 @@ maintainer="André Cerqueira " license="ISC, MIT" homepage="https://github.com/ftrvxmtrx/9pfs" distfiles="https://github.com/ftrvxmtrx/9pfs/archive/${version}.tar.gz" -checksum=dc5f1408a5502c64e239e5614d757d013c75cf6b6851aa925d6dd922198901cf +checksum=6c0a4fd61c87524a444ac8f0050bb2874cb8696c802e15694ac1c5a6460dfbdb post_install() { vlicense LICENSE diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch deleted file mode 100644 index 67092dd0fb6..00000000000 --- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -9,7 +9,6 @@ - conf.set_quoted('PACKAGE_VERSION', meson.project_version()) - - cc = meson.get_compiler('c') --ld = cc.get_linker_id() - objcopy = find_program('objcopy') - objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1] - ---- a/efi/generate_binary.py -+++ b/efi/generate_binary.py -@@ -29,9 +29,9 @@ - "-j", - ".rodata", - "-j", -+ ".areloc", -+ "-j", - ".rel*", -- "--section-alignment", -- "512", - args.infile, - args.outfile, - ] ---- a/efi/meson.build -+++ b/efi/meson.build -@@ -72,6 +72,11 @@ - coff_header_in_crt0 = false - endif - -+# For NX compat, we must ensure we have .note.GNU-stack -+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0 -+ error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt))) -+endif -+ - # older objcopy for Aarch64 and ARM32 are not EFI capable. - # Use 'binary' instead, and add required symbols manually. - if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0)) -@@ -95,7 +100,6 @@ - # is the system crt0 for arm and aarch64 new enough to know about SBAT? - if objcopy_manualsymbols - if get_option('efi_sbat_distro_id') != '' -- arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch) - cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt)) - if cmd.returncode() != 0 - warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt))) -@@ -163,6 +167,12 @@ - '-L', efi_libdir, - join_paths(efi_crtdir, arch_crt)] - -+if host_cpu == 'aarch64' -+# Don't use 64KiB pages -+ efi_ldflags += ['-z', 'common-page-size=4096'] -+ efi_ldflags += ['-z', 'max-page-size=4096'] -+endif -+ - if objcopy_manualsymbols - # older objcopy for Aarch64 and ARM32 are not EFI capable. - # Use 'binary' instead, and add required symbols manually. -@@ -223,11 +233,16 @@ - fwupd_so_deps += [o_crt0] - endif - -+efi_cc_ldflags = [] -+foreach flag : efi_ldflags -+ efi_cc_ldflags += ['-Wl,' + flag] -+endforeach -+ - so = custom_target('fwup.so', - input : [o_file1, o_file2, o_file3, o_file4, o_file5], - output : 'fwup.so', -- command : [ld, '-o', '@OUTPUT@'] + -- efi_ldflags + ['@INPUT@'] + -+ command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] + -+ efi_cc_ldflags + ['@INPUT@'] + - ['-lefi', '-lgnuefi', libgcc_file_name], - depends: fwupd_so_deps) - diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template index 2d811f6165f..75a40c82847 100644 --- a/srcpkgs/fwupd-efi/template +++ b/srcpkgs/fwupd-efi/template @@ -1,6 +1,6 @@ # Template file for 'fwupd-efi' pkgname=fwupd-efi -version=1.4 +version=1.7 revision=1 archs="x86_64* i686* arm* aarch64*" build_style=meson @@ -8,11 +8,11 @@ build_helper="gir" configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib" -hostmakedepends="efivar python3-pefile" +hostmakedepends="efivar python3-pefile cmake pkg-config" makedepends="libefivar-devel gnu-efi-libs" short_desc="EFI Application used by uefi-capsule plugin in fwupd" -maintainer="dkwo " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/fwupd/fwupd-efi" distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz" -checksum=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d +checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 06af297a89e..c4036e3d205 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,6 +1,6 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.9.24 +version=2.0.1 revision=1 build_style=meson build_helper="gir qemu" @@ -11,9 +11,9 @@ hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala glib-devel polkit gettext pango python3-gobject python3-Pillow protobuf-c-devel" makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel - gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel - sqlite-devel gcab-devel pango-devel elogind-devel - tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel" + gnutls-devel gpgme-devel json-glib-devel polkit-devel sqlite-devel gcab-devel + pango-devel elogind-devel flashrom-devel tpm2-tss-devel libjcat-devel + libcurl-devel protobuf-c-devel pciutils-devel gi-docgen" depends="dbus udisks2" checkdepends="umockdev" conf_files=" @@ -25,7 +25,7 @@ license="LGPL-2.1-or-later" homepage="https://github.com/fwupd/fwupd" changelog="https://github.com/fwupd/fwupd/releases" distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz" -checksum=8a8785be525551ee70fa6e747f2a23ba5873f5f3a9c66f614c1d28b7f994e960 +checksum=2266ed0f655e3268221a0f8bd34ab41e1e80b9092978b86fc080e59268b01486 replaces="fwupdate>=0" case "$XBPS_TARGET_MACHINE" in @@ -55,6 +55,10 @@ pre_build() { fi } +if [ -n "$CROSS_BUILD" ]; then + configure_args+=" -Dvendor_ids_dir=${XBPS_CROSS_BASE}/usr/share/hwdata/" +fi + post_install() { vcompletion data/bash-completion/fwupdmgr bash fwupdmgr vcompletion data/bash-completion/fwupdtool bash fwupdtool diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index 5b16da6bfe0..95d9e681b04 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -1,6 +1,6 @@ # Template file for 'fzf' pkgname=fzf -version=0.55.0 +version=0.56.2 revision=1 build_style=go go_import_path="github.com/junegunn/fzf" @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/junegunn/fzf" changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md" distfiles="https://github.com/junegunn/fzf/archive/refs/tags/v${version}.tar.gz" -checksum=805383f71bca7f8fb271ecd716852aea88fd898d5027d58add9e43df6ea766da +checksum=1d67edb3e3ffbb14fcbf786bfcc0b5b8d87db6a0685135677b8ef4c114d2b864 post_install() { cd ${wrksrc} diff --git a/srcpkgs/gcompris-qt/template b/srcpkgs/gcompris-qt/template index 70a72b265f8..335742bfd90 100644 --- a/srcpkgs/gcompris-qt/template +++ b/srcpkgs/gcompris-qt/template @@ -5,7 +5,7 @@ # Otherwise, they may remove it at a random time. # pkgname=gcompris-qt -version=4.0 +version=4.2 revision=1 build_style=cmake configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0" @@ -22,7 +22,7 @@ license="GPL-3.0-or-later" homepage="https://gcompris.net/index-en.html" changelog="https://www.gcompris.net/news-en.html" distfiles="https://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz" -checksum=c1c4ea9caec44affa3587af96ac79d964439ad957d895e0f2d2f32424bee0eb6 +checksum=668726abc949c49e5348b55e8b1e7d7005584208432bb95424979f7f08f2256c post_extract() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template index 236927cb22e..70a208be1db 100644 --- a/srcpkgs/gede/template +++ b/srcpkgs/gede/template @@ -1,18 +1,18 @@ # Template file for 'gede' pkgname=gede -version=2.18.2 +version=2.19.3 revision=1 build_wrksrc=src build_style=qmake hostmakedepends="python3 qt5-qmake qt5-host-tools" -makedepends="qt5-devel" +makedepends="qt5-devel qt5-serialport-devel" depends="gdb ctags" short_desc="Graphical frontend (GUI) to GDB written in Qt" maintainer="Andrea Brancaleoni " license="BSD-2-Clause" -homepage="http://acidron.com/gede" +homepage="https://gede.dexar.se" distfiles="http://gede.dexar.se/uploads/source/${pkgname}-${version}.tar.xz" -checksum=416ac31d5fb6b6b97ec0a2a26d68836be915444375d7a3b043a0e899a2a3dcb6 +checksum=f5f685c928207c3eed59eea532a958f136255767086ce907d1c37ab077de415d do_install() { cd $wrksrc diff --git a/srcpkgs/geomyidae/template b/srcpkgs/geomyidae/template index feb5eaadb9a..739ac93df16 100644 --- a/srcpkgs/geomyidae/template +++ b/srcpkgs/geomyidae/template @@ -1,14 +1,15 @@ # Template file for 'geomyidae' pkgname=geomyidae -version=0.34 +version=0.96 revision=1 build_style=gnu-makefile -short_desc="A small C-based gopherd" +makedepends="libtls-devel" +short_desc="Small C-based gopherd" maintainer="m-cz " license="MIT" homepage="gopher://bitreich.org/1/scm/geomyidae/" -distfiles="ftp://bitreich.org/releases/${pkgname}/${pkgname}-v${version}.tgz" -checksum=2580ad0f229cd3f5c33495975a708679aeaf5276c06ec8d55871d7f69b216eb0 +distfiles="ftp://bitreich.org/releases/${pkgname}/${pkgname}-v${version}.tar.gz" +checksum=3bacdc72bcf9aabb6f69f350bcce7453625f1b8d8b016249fc35df8832a1e1d7 system_accounts="_geomyidae" pre_build() { @@ -21,4 +22,3 @@ post_install() { vsv geomyidae vlicense LICENSE } - diff --git a/srcpkgs/gfan/patches/cstdint.patch b/srcpkgs/gfan/patches/cstdint.patch new file mode 100644 index 00000000000..d6ebed9eddc --- /dev/null +++ b/srcpkgs/gfan/patches/cstdint.patch @@ -0,0 +1,14 @@ +Description: Include for std::int64_t +Author: Doug Torrance +Last-Update: 2024-07-28 + +--- a/src/gfanlib_z.h ++++ b/src/gfanlib_z.h +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #define OLD 1 + #if OLD + #include "gmp.h" diff --git a/srcpkgs/gfan/patches/fix-build.patch b/srcpkgs/gfan/patches/fix-build.patch new file mode 100644 index 00000000000..f8276d04abc --- /dev/null +++ b/srcpkgs/gfan/patches/fix-build.patch @@ -0,0 +1,13 @@ +diff -ru gfan0.7.orig/src/gfanlib_circuittableint.h gfan0.7/src/gfanlib_circuittableint.h +--- gfan0.7.orig/src/gfanlib_circuittableint.h 2024-08-15 22:42:58.870553297 +0200 ++++ gfan0.7/src/gfanlib_circuittableint.h 2024-08-15 22:44:11.891350667 +0200 +@@ -591,7 +591,8 @@ + ret=min; + + { +- auto ret2=CircuitTableIntPOD((s.v*denominatorDivisor.multiplicativeInverse)*boundA.v); ++ CircuitTableIntPOD ret2; ++ ret2.v=(s.v*denominatorDivisor.multiplicativeInverse)*boundA.v; + ret2=MIN(ret2.v,-ret2.v); + return ret2; + if(ret.v!=ret2.v) diff --git a/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch b/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch deleted file mode 100644 index c642e32c224..00000000000 --- a/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch +++ /dev/null @@ -1,18 +0,0 @@ -patch typedef for `int64` which causes hang in `0602ResultantFanProjection` - -cf: -https://github.com/void-linux/void-packages/pull/34182 -https://trac.sagemath.org/ticket/32088 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905300 - ---- a/src/vektor.h 2017-06-20 11:47:37.000000000 -0300 -+++ b/src/vektor.h 2021-11-21 18:28:43.384750825 -0300 -@@ -10,7 +10,7 @@ - - using namespace std; - --typedef signed long int int64; -+typedef int64_t int64; - - void outOfRange(int i, int n); - diff --git a/srcpkgs/gfan/patches/int128.patch b/srcpkgs/gfan/patches/int128.patch new file mode 100644 index 00000000000..949b322a43b --- /dev/null +++ b/srcpkgs/gfan/patches/int128.patch @@ -0,0 +1,225 @@ +Description: Use 128-bit integers from Abseil when not available natively. +Author: Doug Torrance +Last-Update: 2024-10-24 + +--- a/src/gfanlib_circuittableint.h ++++ b/src/gfanlib_circuittableint.h +@@ -17,6 +17,12 @@ + #include + #include "gfanlib_frequencytable.h" + ++#ifndef __SIZEOF_INT128__ ++#include ++typedef absl::int128 __int128_t; ++typedef absl::uint128 __uint128_t; ++#endif ++ + namespace gfan{ + + +@@ -25,7 +31,8 @@ + template struct MyMakeUnsigned; + template <> struct MyMakeUnsigned{typedef unsigned int type;}; + template <> struct MyMakeUnsigned{typedef unsigned long int type;}; +- template <> struct MyMakeUnsigned<__int128>{typedef unsigned __int128 type;}; ++ template <> struct MyMakeUnsigned{typedef unsigned long long int type;}; ++ template <> struct MyMakeUnsigned<__int128_t>{typedef __uint128_t type;}; + + class MVMachineIntegerOverflow: public std::exception + { +@@ -92,6 +99,15 @@ + return s.str(); + } + ++#ifndef __SIZEOF_INT128__ ++static std::string toStr(long int b) ++{ ++ std::stringstream s; ++ s<(lo_)), ++ hi(hi_) ++ { ++ } ++ my256s(__uint128_t lo_,__int128_t hi_): ++ lo(static_cast<__int128_t>(lo_)), ++ hi(hi_) ++ { ++ } ++ my256s(__int128_t lo_,__uint128_t hi_): ++ lo(lo_), ++ hi(static_cast<__int128_t>(hi_)) ++ { ++ } ++#endif + my256s operator+(my256s b) + { + __uint128_t newLo=lo+b.lo; +@@ -165,7 +198,7 @@ + my256s temp(~lo,~hi); + return temp+my256s(1,0); + } +- explicit operator __int128()const ++ explicit operator __int128_t()const + { + return lo; + } +@@ -213,12 +246,23 @@ + { + return ((__int128_t)a)*((__int128_t)b); + } ++static long long int extMul(long long int a, long long int b) ++{ ++ return a * b; ++} + + static __uint128_t unsignedProd64(uint64_t x,uint64_t y) + { + return __uint128_t(x)*__uint128_t(y); + } + ++#ifndef __SIZEOF_INT128__ ++static __uint128_t unsignedProd64(__uint128_t x,__uint128_t y) ++{ ++ return x * y; ++} ++#endif ++ + static my256u unsignedProd128(__uint128_t x,__uint128_t y) + { + my256s a(unsignedProd64(x,y),0); +@@ -302,7 +346,7 @@ + friend CircuitTableIntPOD operator*(CircuitTableIntPOD const &a, CircuitTableIntPOD const &b){CircuitTableIntPOD ret;ret.v=a.v*b.v;return ret;} + friend CircuitTableIntPOD operator/(CircuitTableIntPOD const &a, CircuitTableIntPOD const &b){CircuitTableIntPOD ret;ret.v=a.v/b.v;return ret;}//This is used very few times. Should we require this be an exact division? + public: +- static const word halfBound{(word{1}<<(std::numeric_limits::digits/2-2))-1}; ++ static constexpr word halfBound{(word{1}<<(std::numeric_limits::digits/2-2))-1}; + // In the code products of CircuitTableIntPOD objects are summed. To avoid overflows one of the factors must "fit in half" and the "number of summands" may not exceed a certain number. The bounds are specified in the following functions: + bool fitsInHalf()const{return v>-halfBound && v(v);}//WHAT SHOULD HAPPEN TO THIS FUNCTION? + friend std::ostream &operator<<(std::ostream &f, CircuitTableIntPOD const &a){f<extend();t+=extendedMultiplication(a,b);*this=t.castToSingle();return *this;} +@@ -546,8 +590,8 @@ + int D=std::numeric_limits::digits; + if(D==0){D=127;}//fixes bug in gcc-8.1 + bool doesOverflow=(((word)t.v)==(word{1}<<(D-1)));// What is the purpose of this line. Do we really want to subtract 1? That seems wrong since word is signed. Look at comment below +- longword min64=0; +- longword max64=0; ++ longword min64=static_cast(0); ++ longword max64=static_cast(0); + for(int i=0;i::digits; + if(D==0){D=127;}//fixes bug in gcc-8.1 + bool doesOverflow=false;//(((word)t.v)==(word{1}<<(D-1)));// What is the purpose of this line? t is not defined. Do we really want to subtract 1? That seems wrong since word is signed. Look at comment below +- longword min64=0; +- longword max64=0; ++ longword min64=static_cast(0); ++ longword max64=static_cast(0); + for(int i=0;i=0x7fffffffffffffff || -v>=0x7fffffffffffffff) throw MVMachineIntegerOverflow; + CircuitTableIntPOD ret; +- ret.v=v; ++ ret.v=static_cast(v); + return ret; + } + +@@ -746,7 +789,7 @@ + // DANGER !!! + //if(v>=0x7fffffffffffffffffffffffffffffff || -v>=0x7fffffffffffffffffffffffffffffff) throw MVMachineIntegerOverflow; + CircuitTableIntPOD ret; +- ret.v=__int128(v); ++ ret.v=__int128_t(v); + return ret; + } + +@@ -784,6 +827,7 @@ + CircuitTableInt128()noexcept{v=0;} + CircuitTableInt128(CircuitTableInt128POD const &m){v=m.v;} + CircuitTableInt128(__int128_t val){v=val;} ++ CircuitTableInt128(int val){v=val;} + CircuitTableInt128(std::string const&s){ + int64_t proxy; + std::istringstream a(s); a>>proxy; +--- a/src/app_test.cpp ++++ b/src/app_test.cpp +@@ -764,10 +764,10 @@ + + + { +- __int128 t=0; +- __int128 A=2; +- __int128 s=-4; +- __int128 B=1; ++ __int128_t t=0; ++ __int128_t A=2; ++ __int128_t s=-4; ++ __int128_t B=1; + B=(B<<127)+3; + std::cerr<<"---B\n"; + std::cerr<(M.getHeight()+1,M.getHeight()+1+M.getWidth(),mr); + combinedMatrix.setSubMatrix(0,M.getHeight()+1,M.getHeight(),getWidth(),M); +- for(int i=0;i(1); ++ for(int i=M.getHeight()+1;i(1); + // Matrix M2=M; + // M2.appendRow(Vector::allOnes(M2.getWidth())); + // combinedMatrix=combineLeftRight(M2.identity(M.getHeight()+1),M2,mr); +@@ -347,7 +347,7 @@ + } + assert(inBasis.size()==getWidth()); + for(int i=0;i(1); + computeRowBounds(); + } + Tableau(Tableau const &a, MR *mr=get_default_resource()): diff --git a/srcpkgs/gfan/patches/make_tests_return_error.patch b/srcpkgs/gfan/patches/make_tests_return_error.patch new file mode 100644 index 00000000000..90db055a27e --- /dev/null +++ b/srcpkgs/gfan/patches/make_tests_return_error.patch @@ -0,0 +1,25 @@ +Description: Nonzero return code if tests fail +Origin: https://git.sagemath.org/sage.git/commit/build/pkgs/gfan/patches/maketestsreturnerror.patch?h=develop&id=4ad830c4cbb10ce81d49eb92cbd3b1be2df31e7b +Forwarded: yes +Last-Update: 2020-11-13 + +--- a/src/app_test.cpp ++++ b/src/app_test.cpp +@@ -1414,6 +1414,9 @@ + failed.push_back(i->folder); + } + cout<<"\n"; ++ cout<<"Number of successful tests "<folder); - } - cout<<"\n"; -+ cout<<"Number of succesful tests "< LICENSE @@ -24,7 +63,7 @@ glslang-devel_package() { pkg_install() { vmove usr/include vmove "usr/lib/*.a" - vmove usr/lib/libglslang.so + vmove "usr/lib/*.so" vmove usr/lib/cmake } } diff --git a/srcpkgs/gn/template b/srcpkgs/gn/template new file mode 100644 index 00000000000..0c8795645f6 --- /dev/null +++ b/srcpkgs/gn/template @@ -0,0 +1,40 @@ +# Template file for 'gn' +pkgname=gn +version=0.0.20240706 +revision=1 +_ref=b3a0bff47dd81073bfe67a402971bad92e4f2423 +create_wrksrc=yes +hostmakedepends="python3 ninja" +short_desc="Meta-build system that generates build files for Ninja" +maintainer="Duncaen " +license="BSD-3-Clause" +homepage="https://gn.googlesource.com/gn" +distfiles="https://gn.googlesource.com/gn/+archive/${_ref}.tar.gz" +checksum=@6cc1aea3aaf370d5c4eee864baebebbf17a546e78800c4c068bb1a14a445ab8d + +do_configure() { + cat <<-EOF >src/gn/last_commit_position.h + #ifndef OUT_LAST_COMMIT_POSITION_H_ + #define OUT_LAST_COMMIT_POSITION_H_ + + #define LAST_COMMIT_POSITION_NUM 0 + #define LAST_COMMIT_POSITION "0 (${_ref})" + + #endif // OUT_LAST_COMMIT_POSITION_H_ + EOF + ./build/gen.py --no-last-commit-position --no-static-libstdc++ --no-strip --allow-warnings +} + +do_build() { + ninja ${makejobs} -C out gn +} + +do_check() { + ninja ${makejobs} -C out gn_unittests + ./out/gn_unittests +} + +do_install() { + vbin out/gn + vlicense LICENSE +} diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template index c07a02c2ff0..8ed49320fce 100644 --- a/srcpkgs/gnome-authenticator/template +++ b/srcpkgs/gnome-authenticator/template @@ -1,6 +1,6 @@ # Template file for 'gnome-authenticator' pkgname=gnome-authenticator -version=4.4.0 +version=4.5.0 revision=1 build_style=meson build_helper="rust" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/Authenticator" distfiles="https://gitlab.gnome.org/World/Authenticator/-/archive/${version}/Authenticator-${version}.tar.gz" -checksum=d1349ddc195ca173b64780d153864e3f8613986e6c0504d613c9331e83efab5d +checksum=195d61084f41a90b3ef5dfa433309a5b86beef76ea6cd36e3329b72181eb23a1 make_check=ci-skip # Test timeout while compiling tests post_patch() { diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template index ca77e5650d0..ad6f7eeb35d 100644 --- a/srcpkgs/gnome-mahjongg/template +++ b/srcpkgs/gnome-mahjongg/template @@ -1,10 +1,10 @@ # Template file for 'gnome-mahjongg' pkgname=gnome-mahjongg -version=3.40.1 +version=47.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala - gtk4-update-icon-cache" + gtk4-update-icon-cache desktop-file-utils" makedepends="librsvg-devel libadwaita-devel" short_desc="GNOME Mahjongg solitaire game" maintainer="Orphaned " @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Mahjongg" changelog="https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8ed54eecade36b08336906fd8e6c902a0d6f7bbbbb67653c23956a6b631223f6 +checksum=58f157f0bc5ec71ab8da35dce7e73ca2e8192c5b2f219167a926930b971da49b diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 241351e174f..70378147fa5 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,16 +1,17 @@ # Template file for 'gnome-maps' pkgname=gnome-maps version=46.11 -revision=1 +revision=2 build_style=meson build_helper="gir" hostmakedepends="glib-devel gettext pkg-config AppStream gjs desktop-file-utils gtk-update-icon-cache" makedepends="geoclue2-devel gjs-devel geocode-glib-devel libgweather-devel gnome-desktop-devel libshumate-devel rest-devel libadwaita-devel libportal-devel - librsvg-devel" -depends="geoclue2 gjs libadwaita libgweather rest" -checkdepends="libsecret-devel" + librsvg-devel libsecret-devel" +# List all GI dependencies here. +depends="geoclue2 gjs libadwaita libgweather rest gdk-pixbuf geocode-glib + libshumate libsoup3 libportal graphene libsecret pango" short_desc="GNOME maps application" maintainer="Enno Boland " license="GPL-2.0-or-later" diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template index b359f9bdc10..9a44af335d9 100644 --- a/srcpkgs/gnome-nibbles/template +++ b/srcpkgs/gnome-nibbles/template @@ -1,6 +1,6 @@ # Template file for 'gnome-nibbles' pkgname=gnome-nibbles -version=4.0.4 +version=4.1.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala desktop-file-utils @@ -12,4 +12,4 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Nibbles" changelog="https://gitlab.gnome.org/GNOME/gnome-nibbles/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d712a4c6943bf32956adfb9222f1f14369911e54ecebb0cd61f7c25abd7a59da +checksum=63241bd8a15f59180a61812041e2e8f39862267dc9e652f3d173542c550d9292 diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch deleted file mode 100644 index eb10d1bb176..00000000000 --- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch +++ /dev/null @@ -1,22 +0,0 @@ -riscv64: adjust type definitions - -CHAR8 needs to be defined while BOOLEAN should be removed -here to prevent typedef conflicts - -Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/ ---- ---- a/inc/riscv64/efibind.h 2023-05-02 13:51:45.000000000 +0200 -+++ - 2024-02-16 17:14:57.455180520 +0100 -@@ -32,11 +32,9 @@ - typedef int16_t INT16; - typedef uint8_t UINT8; - typedef int8_t INT8; -+typedef char CHAR8; - typedef wchar_t CHAR16; - #define WCHAR CHAR16 --#ifndef BOOLEAN --typedef uint8_t BOOLEAN; --#endif - #undef VOID - typedef void VOID; - typedef int64_t INTN; diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template index 5c25df7ef5b..c47d33046f2 100644 --- a/srcpkgs/gnu-efi-libs/template +++ b/srcpkgs/gnu-efi-libs/template @@ -1,7 +1,7 @@ # Template file for 'gnu-efi-libs' pkgname=gnu-efi-libs reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8 -version=3.0.17 +version=3.0.18 revision=1 makedepends="pciutils-devel" short_desc="Library for building UEFI Applications using GNU toolchain" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/gnu-efi/" distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2" -checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4 +checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c nostrip=yes # If we are cross-building we need to pass the cross-compilation triplet diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template index 700f90bd6c8..ca910e524ca 100644 --- a/srcpkgs/gnuradio-nrsc5/template +++ b/srcpkgs/gnuradio-nrsc5/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-nrsc5' pkgname=gnuradio-nrsc5 version=2.0.0 -revision=7 +revision=8 build_style=cmake make_cmd=make configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index 1d541ad02ea..fac23dc315c 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.4 -revision=6 +revision=7 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index 04f6299a80f..d827e26f446 100644 --- a/srcpkgs/gnuradio-rds/template +++ b/srcpkgs/gnuradio-rds/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-rds' pkgname=gnuradio-rds version=3.10 -revision=11 +revision=12 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 88dd446a846..96618ae919d 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio -version=3.10.10.0 -revision=2 +version=3.10.11.0 +revision=1 build_style=cmake build_helper="python3" conf_files="/etc/gnuradio/conf.d/*" @@ -23,7 +23,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnuradio.org" distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz" -checksum=4202a486bee49ae97672acae559c133b1337e0e89f2d192332e4381d7c6682da +checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29 python_version=3 if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/godot/patches/fix-glslang.patch b/srcpkgs/godot/patches/fix-glslang.patch new file mode 100644 index 00000000000..0f37d38811d --- /dev/null +++ b/srcpkgs/godot/patches/fix-glslang.patch @@ -0,0 +1,23 @@ +From 4323f8cd47121df428b0394c6ba2a8da1f93a396 Mon Sep 17 00:00:00 2001 +From: Sertonix +Date: Sat, 22 Jun 2024 17:14:11 +0000 +Subject: [PATCH] Fix missing lib with builtin_glslang=false + +The `GetDefaultResource` function is in separate library file. +--- + platform/linuxbsd/detect.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py +index 303a88ab2611..0e24370d8a38 100644 +--- a/platform/linuxbsd/detect.py ++++ b/platform/linuxbsd/detect.py +@@ -480,7 +480,7 @@ def configure(env: "SConsEnvironment"): + env.ParseConfig("pkg-config vulkan --cflags --libs") + if not env["builtin_glslang"]: + # No pkgconfig file so far, hardcode expected lib name. +- env.Append(LIBS=["glslang", "SPIRV"]) ++ env.Append(LIBS=["glslang", "SPIRV", "glslang-default-resource-limits"]) + + if env["opengl3"]: + env.Append(CPPDEFINES=["GLES3_ENABLED"]) diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 837142ec1d3..618d8a77a18 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,11 +1,11 @@ # Template file for 'godot' pkgname=godot version=4.3 -revision=6 +revision=7 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=scons make_build_args="platform=linuxbsd target=editor progress=no production=yes - lto=auto builtin_brotli=false builtin_enet=false + lto=auto builtin_brotli=false builtin_enet=false builtin_glslang=false builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false builtin_icu4c=false builtin_libogg=false builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false @@ -17,7 +17,7 @@ makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel - pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel + pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel glslang-devel speech-dispatcher-devel brotli-devel icu-devel wayland-devel" depends="speech-dispatcher" short_desc="Multiplatform 2D and 3D engine" diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index dc12d3b14ff..36623152363 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=129.0.6668.89 +version=130.0.6723.116 revision=1 _channel=stable archs="x86_64" @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="custom:chrome" homepage="https://www.google.com/chrome/" distfiles="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-${_channel}_${version}-1_amd64.deb" -checksum=eec893b085b6f71e1767e66eb7d6f9045493b5ce6dba1c6eb319e424fa2e1b5c +checksum=1ef2cf8d0499938ce6417a31871ba3a16019f24d2a8af0b209d2e9071389e0e0 skiprdeps="/opt/google/chrome/libqt5_shim.so /opt/google/chrome/libqt6_shim.so" repository=nonfree diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template index be93b18ba2f..7cbd740f43f 100644 --- a/srcpkgs/gqrx/template +++ b/srcpkgs/gqrx/template @@ -1,7 +1,7 @@ # Template file for 'gqrx' pkgname=gqrx version=2.17.5 -revision=2 +revision=3 build_style=cmake configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio) $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)" diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index ba7d8d3b744..cd31109d2d2 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -1,6 +1,6 @@ # Template file for 'graphviz' pkgname=graphviz -version=12.1.1 +version=12.2.0 revision=1 build_style=gnu-configure configure_args="--with-gts --with-ann=no" @@ -16,7 +16,7 @@ license="EPL-1.0" homepage="https://www.graphviz.org" changelog="https://gitlab.com/graphviz/graphviz/-/raw/main/CHANGELOG.md" distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz" -checksum=8fea54ab3ae6f2456df2f1ee8060f0262f2f4434c5b6ece2216777a2505a88e3 +checksum=0063e501fa4642b55f4daf82820b2778bfb7dafa651a862ae5c9810efb8e2311 # `make check` is broken: # https://gitlab.com/graphviz/graphviz/-/issues/2112 diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template index 260baa078be..aad752657e2 100644 --- a/srcpkgs/grype/template +++ b/srcpkgs/grype/template @@ -1,6 +1,6 @@ # Template file for 'grype' pkgname=grype -version=0.80.0 +version=0.84.0 revision=1 build_style=go build_helper=qemu @@ -13,7 +13,8 @@ license="Apache-2.0" homepage="https://github.com/anchore/grype" changelog="https://github.com/anchore/grype/releases" distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz" -checksum=554b7e5fbc8c79e88475a77c47d1f4466d51880d922423cbffac132dd029fadd +checksum=d93b200053588e3b03b133bd36d8e39e80c053d31baa0c326b8bb90928667e27 +make_check=no # tests require a running docker daemon post_install() { grype="${DESTDIR}/usr/bin/grype" diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index 0b3bd0b73bf..f7ae6319009 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,6 +1,6 @@ # Template file for 'gst-libav' pkgname=gst-libav -version=1.24.6 +version=1.24.9 revision=1 build_style=meson hostmakedepends="pkg-config yasm" @@ -12,7 +12,7 @@ license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${version}.tar.xz" -checksum=4bbd08481a390f907e342aa3f25ab885c80ec0a53f3b14244cf733cc8622f2bf +checksum=32682e9ae508ee01f4fb134b3a520081e2ac007220997577624b1d16171d456c case "$XBPS_TARGET_MACHINE" in *-musl) # Required by musl for M_SQRT1_2 diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 13fc9f8fe7f..3d8e76ae298 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 -version=1.24.6 -revision=2 +version=1.24.9 +revision=1 build_helper="gir" build_style=meson configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled @@ -35,7 +35,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" -checksum=8f4d965513e7827c1f547c1e749e4ef2812b371974fe64857fe5029a19c5b64c +checksum=36fcf7a9af0a753b43bb03b9835246f74d72f7124369e66a1e2dc7b04f5a5cab build_options="gir gme onevpl wayland" build_options_default="gir wayland" diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 0addf1aca2e..8d1dc9f3818 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-base1' pkgname=gst-plugins-base1 -version=1.24.6 +version=1.24.9 revision=1 build_style=meson build_helper="gir" @@ -22,7 +22,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${version}.tar.xz" -checksum=cf52b535a0ce7ec974756891818f34f06317c2e136abb24149e18c23ecc229b5 +checksum=5bb3b946907d3ce04dd842b610c8111c2b0611351b25a1fa22af5efa897857cb build_options="cdparanoia gir sndio wayland" build_options_default="cdparanoia gir wayland" diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 9dd28563c80..69ccc769568 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-good1' pkgname=gst-plugins-good1 -version=1.24.6 +version=1.24.9 revision=1 build_style=meson configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled @@ -23,7 +23,7 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${version}.tar.xz" -checksum=996b9c8d1d246ed43be304718b6086e5a17d4ae8114d1920aed9ea75b920ba2d +checksum=897de50bff337e3ca2f86f1eaa28e0828d83024156162a50c4ea0af86e29799f build_options="gtk3 wayland" build_options_default="gtk3 wayland" diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index eda9ac5e433..c50637ed075 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-ugly1' pkgname=gst-plugins-ugly1 -version=1.24.6 +version=1.24.9 revision=1 build_style=meson configure_args=" -Dsidplay=disabled -Dgpl=enabled -Dx264=enabled @@ -17,4 +17,4 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${version}.tar.xz" -checksum=5dfdbb2978ab282e637255cd875cf5b7b93fc83db62f8a0b1af02c85c84a75c4 +checksum=4b6b30110f38cd05eb67422297142b75a55fe00003105f48b13603e6761cc3b6 diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template index f8ec3b41161..3d179e5030b 100644 --- a/srcpkgs/gst-rtsp-server/template +++ b/srcpkgs/gst-rtsp-server/template @@ -1,6 +1,6 @@ # Template file for 'gst-rtsp-server' pkgname=gst-rtsp-server -version=1.24.8 +version=1.24.9 revision=1 build_style=meson build_helper=gir @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz" -checksum=84ed2b34b8f581a418d8ab8eff7657635fcf83c8960f27065c6c47e52836ed02 +checksum=299c9aafac3c91bbebe4cd481ed4e4ade8cb2b0677097bc4a8dcf6d4364c9804 gst-rtsp-server-devel_package() { depends="${sourcepkg}>=${version}_${revision} gst-plugins-base1-devel" diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index d7dfd3f6983..2f2f8ed71d8 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -1,6 +1,6 @@ # Template file for 'gst1-editing-services' pkgname=gst1-editing-services -version=1.24.6 +version=1.24.9 revision=1 build_style=meson build_helper="gir" @@ -14,7 +14,7 @@ license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${version}.tar.xz" -checksum=138fa25cab9d5bfee5fcc0a75e199a18baff60309ca662e2807fbd1cdee1a266 +checksum=07506e53bec6c54ec1dfaa5033bad8df42d2f217451822b4c8bf783ef8a27012 build_options="gir" diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index f3a1c6cc768..81a83de1d46 100644 --- a/srcpkgs/gst1-python3/template +++ b/srcpkgs/gst1-python3/template @@ -1,6 +1,6 @@ # Template file for 'gst1-python3' pkgname=gst1-python3 -version=1.24.6 +version=1.24.9 revision=1 build_style=meson hostmakedepends="pkg-config python3" @@ -12,5 +12,5 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-python/gst-python-${version}.tar.xz" -checksum=692e88820e097b30e5f92d37d0955c709a0a17b27f874a1907405244825bd700 +checksum=80e61d587c34cbac79e46c927b71cf32c4bf9bb0868ce5aa4b7444bdad83f42e make_check=no # Upstream didn't adjust checks to match their API changes diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template index 2acb3c4c372..381a14594bf 100644 --- a/srcpkgs/gstreamer-vaapi/template +++ b/srcpkgs/gstreamer-vaapi/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer-vaapi' pkgname=gstreamer-vaapi -version=1.24.6 +version=1.24.9 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" -checksum=b5caa057e7efc51cd70504a59e5d9c7a5406d8268723c8283dd61be27fd8cacc +checksum=c2373e9b4d6655535d355207f60084b0fb3b28566fe9bb4ca1da714439da4ae1 pre_check() { # Seems to need certain hardware to pass diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 2fbc637a0d2..4fefac70134 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer1' pkgname=gstreamer1 -version=1.24.6 +version=1.24.9 revision=1 build_style=meson build_helper="gir" @@ -17,7 +17,7 @@ license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version}.tar.xz" -checksum=64342060d7c6f9e36a35e3be38a4f5ac3b41ed93b0853619be45141ef3cc1b9d +checksum=ebf47b6beef508a00c8557d4c1f1713e5c7ef9ba70dac45deed80e182bcf260f pre_check() { # gst_gstdatetime is known to fail according to LFS diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template index 15f8f137e3c..eda7b6470c9 100644 --- a/srcpkgs/gtklock/template +++ b/srcpkgs/gtklock/template @@ -1,6 +1,6 @@ # Template file for 'gtklock' pkgname=gtklock -version=3.0.0 +version=4.0.0 revision=1 build_style=meson hostmakedepends="pkg-config glib-devel scdoc" @@ -10,7 +10,7 @@ maintainer="Jovan Lanik " license="GPL-3.0-or-later" homepage="https://github.com/jovanlanik/gtklock" distfiles="https://github.com/jovanlanik/gtklock/archive/refs/tags/v${version}.tar.gz" -checksum=a65e8636680c1fb11c449ecb0c88771345a9535150b7a372bc615def6bea2c7c +checksum=db20bf27bd5dd01901ea1753c89c170777dd7cf8fca19130cf90f5f4e3fb9633 post_install() { # copying CSS example provided diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template index c1e8c82c7dc..a1168e5b0ea 100644 --- a/srcpkgs/gtkwave/template +++ b/srcpkgs/gtkwave/template @@ -1,6 +1,6 @@ # Template file for 'gtkwave' pkgname=gtkwave -version=3.3.119 +version=3.3.121 revision=1 build_style=gnu-configure configure_args="--enable-gtk3 --with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, MIT" homepage="https://gtkwave.sourceforge.net/" distfiles="https://gtkwave.sourceforge.net/gtkwave-gtk3-${version}.tar.gz" -checksum=eab3e09e7641115c07848bfb30f7dd0c3bbe2b8cbe45017e95e077dbba6ac038 +checksum=54aa45788d6d52afb659c3aef335aafde0ef2c8990a7770f8eaa64e57f227346 post_install() { vlicense LICENSE.TXT diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template index ced5d6d4c8b..5797b34da78 100644 --- a/srcpkgs/gucharmap/template +++ b/srcpkgs/gucharmap/template @@ -1,6 +1,6 @@ # Template file for 'gucharmap' pkgname=gucharmap -version=15.0.0 +version=16.0.1 revision=1 build_style=meson build_helper="gir" @@ -23,13 +23,13 @@ distfiles="https://gitlab.gnome.org/GNOME/gucharmap/-/archive/${version}/gucharm https://www.unicode.org/Public/${version%%.*}.0.0/ucd/Scripts.txt https://www.unicode.org/Public/${version%%.*}.0.0/ucd/UnicodeData.txt https://www.unicode.org/Public/${version%%.*}.0.0/ucd/Unihan.zip" -checksum="c85c1554923df5028de1247bbba782e61ba15f2d21a711a68b23cd3a35788c97 - 529dc5d0f6386d52f2f56e004bbfab48ce2d587eea9d38ba546c4052491bd820 - 7570877e0fa197c45338f7c41a02636da4e14c8dba6a3611a01cd30bf329d5ca - 904fee81f5005e7a3d36e7afd0c5e6f643ee588dca531fdc9937e43c51216081 - cca85d830f46aece2e7c1459ef1249993dca8f2e46d51e869255be140d7ea4b0 - 806e9aed65037197f1ec85e12be6e8cd870fc5608b4de0fffd990f689f376a73 - 24b154691fc97cb44267b925d62064297086b3f896b57a8181c7b6d42702a026" +checksum="d687d3a3d4990ea7aff4066e17768ec9fefe7b3129b98090c750b8d7074b4764 + f3907b395d410f1b97342292ca6bc83dd12eb4b205f2a0c48efdef99e517d7b0 + 60caa81b99a4dfb0bc5d38440d323073e3f356f46f9ca7869da848cd0715408b + 6a299e9259d07c2a941fdc967e2117e1246d56aa4e133caff86dfc0845715679 + 9e88f0a677df47311106340be8ede2ecdacd9c1c931831218d2be6d5508e0039 + ff58e5823bd095166564a006e47d111130813dcf8bf234ef79fa51a870edb48f + b8f000df69de7828d21326a2ffea462b04bc7560022989f7cc704f10521ef3e0" skip_extraction="Blocks.txt DerivedAge.txt NamesList.txt Scripts.txt UnicodeData.txt Unihan.zip" # Package build options diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template index 82fb3fb1ce0..da5d8ef7194 100644 --- a/srcpkgs/gwenview/template +++ b/srcpkgs/gwenview/template @@ -1,6 +1,6 @@ # Template file for 'gwenview' pkgname=gwenview -version=24.08.2 +version=24.08.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake @@ -21,4 +21,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/gwenview" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=1d57dc49b034e44db5aed6e28cbdc21e8e3773b0dcb4de768e4f11d1dba4ec32 +checksum=99a51e572adac269bf932fc90b2897376cc05e6d22f539a33c3e10c287ab7746 diff --git a/srcpkgs/halloy/INSTALL.msg b/srcpkgs/halloy/INSTALL.msg deleted file mode 100644 index 4f05b3c7b32..00000000000 --- a/srcpkgs/halloy/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -NOTICE: Halloy starting from 2024.5 changed to TOML configuration files -without providing an automated migration path or backward support. - -Users updating from earlier versions are expected to manually port their config -to new format: https://halloy.squidowl.org/guides/migrating-from-yaml.html diff --git a/srcpkgs/halloy/template b/srcpkgs/halloy/template index 28612ba559c..3e09bf62fdd 100644 --- a/srcpkgs/halloy/template +++ b/srcpkgs/halloy/template @@ -1,6 +1,6 @@ # Template file for 'halloy' pkgname=halloy -version=2024.12 +version=2024.14 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/squidowl/halloy" changelog="https://raw.githubusercontent.com/squidowl/halloy/main/CHANGELOG.md" distfiles="https://github.com/squidowl/halloy/archive/refs/tags/${version}.tar.gz" -checksum=df773c2e7ad6bf335fe2cdfd721f8873550cfb5554a9c1734bae76cee1282871 +checksum=f5f9509770c628e021a9ea8d5eed4b51aa3c7b4a792ff2de55cc1596f6f5c50b post_install() { vinstall assets/linux/org.squidowl.halloy.appdata.xml 644 usr/share/metainfo diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 09aa2c4dc92..a0aad1cf28a 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,6 +1,6 @@ # Template file for 'harfbuzz' pkgname=harfbuzz -version=10.0.1 +version=10.1.0 revision=1 build_style=meson build_helper="gir qemu" @@ -21,7 +21,7 @@ license="MIT" homepage="https://harfbuzz.github.io/" changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS" distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz" -checksum=b2cb13bd351904cb9038f907dc0dee0ae07127061242fe3556b2795c4e9748fc +checksum=6ce3520f2d089a33cef0fc48321334b8e0b72141f6a763719aaaecd2779ecb82 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -Dtests=enabled" diff --git a/srcpkgs/hexyl/template b/srcpkgs/hexyl/template index 834743966df..a6d30c727f2 100644 --- a/srcpkgs/hexyl/template +++ b/srcpkgs/hexyl/template @@ -1,6 +1,6 @@ # Template file for 'hexyl' pkgname=hexyl -version=0.14.0 +version=0.15.0 revision=1 build_style=cargo short_desc="Command-line hex viewer" @@ -8,8 +8,8 @@ maintainer="cinerea0 " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/hexyl" changelog="https://raw.githubusercontent.com/sharkdp/hexyl/master/CHANGELOG.md" -distfiles="https://github.com/sharkdp/hexyl/archive/v${version}.tar.gz" -checksum=5205fa1a483c66997f5a7179cdd1a277ebb5e0a743bb269a962d20b29dd735f8 +distfiles="https://github.com/sharkdp/hexyl/archive/refs/tags/v${version}.tar.gz" +checksum=017ab7fe18caa3d13427fb13fd6050a9d8bf9aa26d1e1fe02924dfd7f86cd3cf post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/hikari/patches/restack_xwayland_windows.patch b/srcpkgs/hikari/patches/restack_xwayland_windows.patch deleted file mode 100644 index 91fc5f47fae..00000000000 --- a/srcpkgs/hikari/patches/restack_xwayland_windows.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/xwayland_view.c 2023-10-02 23:25:53.794255011 -0400 -+++ b/src/xwayland_view.c 2023-10-02 23:26:17.173265450 -0400 -@@ -304,6 +304,7 @@ - struct wlr_xwayland_surface *xwayland_surface = xwayland_view->surface; - - wlr_xwayland_surface_activate(xwayland_surface, active); -+ wlr_xwayland_surface_restack(xwayland_surface, NULL, XCB_STACK_MODE_ABOVE); - wlr_xwayland_set_seat(hikari_server.xwayland, hikari_server.seat); - } - diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template deleted file mode 100644 index 5ccc9a293fd..00000000000 --- a/srcpkgs/hikari/template +++ /dev/null @@ -1,40 +0,0 @@ -# Template file for 'hikari' -pkgname=hikari -version=2.3.3 -revision=3 -build_style=gnu-makefile -make_cmd=bmake -make_use_env=yes -make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES - WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX=" -make_install_args="ETC_PREFIX= WITHOUT_SUID=YES" -hostmakedepends="bmake pkg-config wayland-devel" -makedepends="wlroots0.15-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel" -short_desc="Stacking Wayland compositor with tiling features" -maintainer="yosh " -license="BSD-2-Clause" -homepage="https://hikari.acmelabs.space" -changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md" -distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz" -checksum=40736ff326e11a51128c1739051a692ad2c79173fc4b695c8be5ec7a614b4de2 -conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf" -# bmake's -q flag seems to differ in behavior from gnu make which causes the -# build style's handling of the check target not existing to fail. -make_check=no - -pre_build() { - # The hikari Makefile appends to the CFLAGS and LDFLAGS variables; - # bmake ignores these appends altogether when passing variables on the - # command line (i.e., when make_use_env is undefined), but it ignores - # the values in the environment when make_use_env=yes. The _EXTRA - # variables provided in the Makefile allow us to force the right flags. - export CFLAGS_EXTRA="${CFLAGS} -Wno-error" - export LDFLAGS_EXTRA="${LDFLAGS}" - - # bmake tends to ignore CC in the environment - make_build_args+=" CC=$CC" -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/horst/template b/srcpkgs/horst/template index ac8be9bb926..8988e316f7a 100644 --- a/srcpkgs/horst/template +++ b/srcpkgs/horst/template @@ -3,16 +3,16 @@ pkgname=horst version=5.1 revision=1 build_style=gnu-makefile -CFLAGS="-std=gnu99 -g -I. -I${XBPS_CROSS_BASE}/usr/include/libnl3 -DVERSION='\"${version}\"'" hostmakedepends="pkg-config" makedepends="ncurses-devel libnl3-devel" conf_files="/etc/horst.conf" short_desc="Lightweight IEEE802.11 wireless LAN analyzer with a text interface" maintainer="Duncaen " license="GPL-2.0-or-later" -homepage="http://br1.einfach.org/tech/horst/" +homepage="https://github.com/br101/horst" distfiles="https://github.com/br101/horst/archive/v${version}.tar.gz" checksum=74b4cb1143d93c73c3b4bbbe0c36f89a790401bde9e894e94e2a27339ca384d9 +CFLAGS="-std=gnu99 -g -I. -I${XBPS_CROSS_BASE}/usr/include/libnl3 -DVERSION='\"${version}\"'" do_check() { : # only checks sources and fails on include diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template index 45fb0349664..6ab938f0152 100644 --- a/srcpkgs/httpie/template +++ b/srcpkgs/httpie/template @@ -1,6 +1,6 @@ # Template file for 'httpie' pkgname=httpie -version=3.2.3 +version=3.2.4 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -8,12 +8,12 @@ depends="python3-setuptools python3-requests python3-requests-toolbelt python3-Pygments python3-pysocks python3-defusedxml python3-charset-normalizer python3-multidict python3-rich" short_desc="Modern, user-friendly command-line HTTP client for the API era" -maintainer="classabbyamp " +maintainer="Orphaned " license="BSD-3-Clause" homepage="https://httpie.io/" changelog="https://raw.githubusercontent.com/httpie/httpie/master/CHANGELOG.md" distfiles="https://github.com/httpie/httpie/archive/${version}.tar.gz" -checksum=91cb6cbd1f9e6115ffc13824e87b2a4d903d76c769859e81924913adbf609c1b +checksum=b185cd8d81325f97c773582e50f1c5e047c2d8575b53d676469c9daf2a52f341 # requires pytest-lazy-fixture (not packaged), many tests fail make_check=no diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 20a3fd95c58..9e523bc67cf 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.136.2 +version=0.139.0 revision=1 build_style=go build_helper=qemu @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://gohugo.io" distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz" -checksum=ca8ba334a181fe257bfc94e700aed7c514acf6898ad2f861d57d8702cd19e0df +checksum=4eeba2c3f993d05267d604eca2a5929a090663c437a1585c0607bfcfaa5a8c95 post_install() { vdoc README.md diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template index e54080f2e63..4670a107e0d 100644 --- a/srcpkgs/hwloc/template +++ b/srcpkgs/hwloc/template @@ -1,6 +1,6 @@ # Template file for 'hwloc' pkgname=hwloc -version=2.10.0 +version=2.11.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://www.open-mpi.org/projects/hwloc/" distfiles="https://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=0305dd60c9de2fbe6519fe2a4e8fdc6d3db8de574a0ca7812b92e80c05ae1392 +checksum=f7f88fecae067100f1a1a915b658add0f4f71561259482910a69baea22fe8409 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";; diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template index fc905aa7151..c16aec42f51 100644 --- a/srcpkgs/hyperfine/template +++ b/srcpkgs/hyperfine/template @@ -1,15 +1,15 @@ # Template file for 'hyperfine' pkgname=hyperfine -version=1.18.0 +version=1.19.0 revision=1 build_style=cargo short_desc="Command-line benchmarking tool" maintainer="Wilson Birney " -license="MIT, Apache-2.0" +license="MIT OR Apache-2.0" homepage="https://github.com/sharkdp/hyperfine" changelog="https://raw.githubusercontent.com/sharkdp/hyperfine/master/CHANGELOG.md" distfiles="https://github.com/sharkdp/hyperfine/archive/refs/tags/v${version}.tar.gz" -checksum=fea7b92922117ed04b9c84bb9998026264346768804f66baa40743c5528bed6b +checksum=d1c782a54b9ebcdc1dedf8356a25ee11e11099a664a7d9413fdd3742138fa140 export SHELL_COMPLETIONS_DIR=${XBPS_BUILDDIR}/${pkgname}-${version} diff --git a/srcpkgs/i2c-tools/patches/py-smbus_fix-destdir.patch b/srcpkgs/i2c-tools/patches/py-smbus_fix-destdir.patch deleted file mode 100644 index f61e4122cd6..00000000000 --- a/srcpkgs/i2c-tools/patches/py-smbus_fix-destdir.patch +++ /dev/null @@ -1,35 +0,0 @@ -I had to add '--root' to the patch for it to not poison the masterdir. - That part will still be needed as a patch when the next version gets released. - -- 0x5c -original message below - -From a4609318b6fa594f970673d77397f1ca74b4120a Mon Sep 17 00:00:00 2001 -From: Morten Linderud -Date: Mon, 4 Oct 2021 20:01:53 +0200 -Subject: py-smbus/Module.mk: Install with PREFIX defined - -If we are building to a defined destdir py-smbus is going to ignore this -and try install to the actual root. This breaks packaging setups as the -install section would fail. - -Signed-off-by: Morten Linderud -Signed-off-by: Jean Delvare ---- - py-smbus/Module.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/py-smbus/Module.mk b/py-smbus/Module.mk -index 04ceb64..1e2ded1 100644 ---- a/py-smbus/Module.mk -+++ b/py-smbus/Module.mk -@@ -22,7 +22,7 @@ clean-python: - rm -rf py-smbus/build - - install-python: -- $(DISTUTILS) install -+ $(DISTUTILS) install --prefix="$(PREFIX)" --root="$(DESTDIR)" - - all: all-python - --- -cgit 1.2.3-1.el7 diff --git a/srcpkgs/i2c-tools/patches/py-smbus_use-setuptools.patch b/srcpkgs/i2c-tools/patches/py-smbus_use-setuptools.patch deleted file mode 100644 index c31e8757b4f..00000000000 --- a/srcpkgs/i2c-tools/patches/py-smbus_use-setuptools.patch +++ /dev/null @@ -1,33 +0,0 @@ -From cf3541b8a7ed50782edd05836020d31230fb86c6 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 19 Jan 2022 12:08:53 +0100 -Subject: py-smbus: Use setuptools instead of distutils - -As per [1], distutils is deprecated in Python 3.10 and will be removed -entirely in Python 3.12. - -As setuptools is essentially an enhanced version of distutils, it's -trivial to port to that. - -[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated - -Signed-off-by: Ross Burton -Signed-off-by: Jean Delvare ---- - py-smbus/setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/py-smbus/setup.py b/py-smbus/setup.py -index 28a4500..26db33a 100644 ---- a/py-smbus/setup.py -+++ b/py-smbus/setup.py -@@ -1,6 +1,6 @@ - #!/usr/bin/env python - --from distutils.core import setup, Extension -+from setuptools import setup, Extension - - setup( name="smbus", - version="1.1", --- -cgit 1.2.3-1.el7 diff --git a/srcpkgs/i2c-tools/template b/srcpkgs/i2c-tools/template index 945521c0f96..a31e6ee801d 100644 --- a/srcpkgs/i2c-tools/template +++ b/srcpkgs/i2c-tools/template @@ -1,12 +1,11 @@ # Template file for 'i2c-tools' pkgname=i2c-tools -version=4.3 -revision=5 +version=4.4 +revision=1 build_style=gnu-makefile build_helper=python3 -make_build_args="EXTRA=py-smbus" -make_install_args="sbindir=/usr/bin EXTRA=py-smbus" -hostmakedepends="python3 python3-setuptools" +make_install_args="sbindir=/usr/bin" +hostmakedepends="python3 python3-build python3-installer python3-wheel" makedepends="python3-devel" depends="perl" short_desc="Heterogeneous set of I2C tools" @@ -14,11 +13,22 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://i2c.wiki.kernel.org/index.php/I2C_Tools" distfiles="https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools/i2c-tools-${version}.tar.xz" -checksum=1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9 +checksum=8b15f0a880ab87280c40cfd7235cfff28134bf14d5646c07518b1ff6642a2473 system_groups="i2c" +post_build() { + ( + cd py-smbus + python -m build --no-isolation --wheel . + ) +} + post_install() { vinstall "${FILESDIR}/45-i2c-tools.rules" 644 usr/lib/udev/rules.d + ( + cd py-smbus + python -m installer --destdir="$DESTDIR" dist/*.whl + ) } i2c-tools-devel_package() { diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template index 677ba23d11a..62d72cee3ab 100644 --- a/srcpkgs/i3/template +++ b/srcpkgs/i3/template @@ -1,6 +1,6 @@ # Template file for 'i3' pkgname=i3 -version=4.23 +version=4.24 revision=1 build_style=meson hostmakedepends="pkg-config perl" @@ -15,7 +15,7 @@ license="BSD-3-Clause" homepage="https://i3wm.org/" changelog="https://i3wm.org/downloads/RELEASE-NOTES-${version}.txt" distfiles="https://i3wm.org/downloads/i3-${version}.tar.xz" -checksum=61026a7196c9139d0f3aadd27197e8b320c576e3a450e01d74c1aca484044c46 +checksum=5baefd0e5e78f1bafb7ac85deea42bcd3cbfe65f1279aa96f7e49661637ac981 make_check=no # Michael disables tests in Debian rules, too post_install() { diff --git a/srcpkgs/iaito/template b/srcpkgs/iaito/template index d2a679e4d61..9008afabd1f 100644 --- a/srcpkgs/iaito/template +++ b/srcpkgs/iaito/template @@ -1,6 +1,6 @@ # Template file for 'iaito' pkgname=iaito -version=5.9.4 +version=5.9.6 revision=1 build_wrksrc=src build_style=qmake @@ -11,4 +11,4 @@ maintainer="yosh " license="GPL-3.0-only" homepage="https://radare.org/n/iaito.html" distfiles=https://github.com/radareorg/iaito/archive/$version.tar.gz -checksum=0a0b9ccc7619e631d5cd38429aa0bac19a9b0ae1c688c11c364b71bbc302cfb3 +checksum=e1f314df752dbb6be1cc3bd992a33e547f5f4734c8d93985ea13c631dfb18c71 diff --git a/srcpkgs/inkscape/patches/filter_effects_dialog.patch b/srcpkgs/inkscape/patches/filter_effects_dialog.patch deleted file mode 100644 index fccff9499a5..00000000000 --- a/srcpkgs/inkscape/patches/filter_effects_dialog.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff '--color=auto' -ur a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp ---- a/src/ui/dialog/filter-effects-dialog.cpp 2023-11-16 20:05:21.000000000 +0100 -+++ b/src/ui/dialog/filter-effects-dialog.cpp 2024-05-31 00:52:13.179734092 +0200 -@@ -202,7 +202,7 @@ - template< typename T> class ComboWithTooltip : public Gtk::EventBox - { - public: -- ComboWithTooltip(T default_value, const Util::EnumDataConverter& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr) -+ ComboWithTooltip(T default_value, const Util::EnumDataConverter& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr) - { - if (tip_text) { - set_tooltip_text(tip_text); diff --git a/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch deleted file mode 100644 index dc5b0f53460..00000000000 --- a/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Fri, 17 Nov 2023 22:30:42 +0100 -Subject: [PATCH] include missing header file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes build error: -``` -/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’: -/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’? - 86 | xmlFree(full); -``` ---- - src/object/uri.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/object/uri.h b/src/object/uri.h -index 381adec58cf..d5b211fe2b2 100644 ---- a/src/object/uri.h -+++ b/src/object/uri.h -@@ -13,6 +13,7 @@ - #define INKSCAPE_URI_H - - #include -+#include - #include - #include - --- -GitLab - diff --git a/srcpkgs/inkscape/patches/inkscape-1.3.2-cxx20.patch b/srcpkgs/inkscape/patches/inkscape-1.3.2-cxx20.patch deleted file mode 100644 index 3c61b191927..00000000000 --- a/srcpkgs/inkscape/patches/inkscape-1.3.2-cxx20.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1798e9c13b786f3d077ba0132592c4d5c1d1fb9b Mon Sep 17 00:00:00 2001 -From: Tavmjong Bah -Date: Tue, 26 Sep 2023 19:23:27 +0000 -Subject: [PATCH] Up C++ version to C++20. - ---- - CMakeLists.txt | 4 ++-- - _clang-format | 2 +- - src/ui/knot/knot-holder-entity.cpp | 2 +- - src/ui/tools/pencil-tool.cpp | 9 ++++++--- - 4 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe6b10cda24..de2680bd651 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,9 +18,9 @@ message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") - # ----------------------------------------------------------------------------- - # CMake Configuration - # ----------------------------------------------------------------------------- --set(CMAKE_CXX_STANDARD 17) -+set(CMAKE_CXX_STANDARD 20) - set(CMAKE_CXX_STANDARD_REQUIRED ON) --# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++17 instead of -std=gnu++17 -+# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++20 instead of -std=gnu++20 - # TODO: build currently fails with it as we actually depend on GNU compiler extensions... - # mostly use of the non-Standard M_PI et al. TODO: C++20: Use the header. - -diff --git a/_clang-format b/_clang-format -index 39396fad65a..48de4d2bd88 100644 ---- a/_clang-format -+++ b/_clang-format -@@ -103,7 +103,7 @@ SpacesInContainerLiterals: false - SpacesInCStyleCastParentheses: false - SpacesInParentheses: false - SpacesInSquareBrackets: false --Standard: c++17 -+Standard: c++20 - StatementMacros: [] - TypenameMacros: [] - TabWidth: 4 -diff --git a/src/ui/knot/knot-holder-entity.cpp b/src/ui/knot/knot-holder-entity.cpp -index 8703f5975f7..add66d2fa29 100644 ---- a/src/ui/knot/knot-holder-entity.cpp -+++ b/src/ui/knot/knot-holder-entity.cpp -@@ -315,7 +315,7 @@ void PatternKnotHolderEntityScale::knot_set(Geom::Point const &p, Geom::Point co - double scale_x = std::clamp(new_extent[X] / _cached_diagonal[X], _cached_min_scale, 1e9); - double scale_y = std::clamp(new_extent[Y] / _cached_diagonal[Y], _cached_min_scale, 1e9); - -- Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale(lerp(0.5, scale_x, scale_y)) -+ Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale((scale_x + scale_y) * 0.5) - : Scale(scale_x, scale_y); - - // 2. Calculate offset to keep pattern origin aligned -diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp -index fd2d08cad0c..7324f7c8515 100644 ---- a/src/ui/tools/pencil-tool.cpp -+++ b/src/ui/tools/pencil-tool.cpp -@@ -17,7 +17,11 @@ - * Released under GNU GPL v2+, read the file 'COPYING' for more information. - */ - --#include // For std::accumulate -+#include "pencil-tool.h" -+ -+#include // std::lerp -+#include // std::accumulate -+ - #include - #include - -@@ -26,7 +30,6 @@ - #include <2geom/sbasis-to-bezier.h> - #include <2geom/svg-path-parser.h> - --#include "pencil-tool.h" - - #include "context-fns.h" - #include "desktop.h" -@@ -806,7 +809,7 @@ void PencilTool::_addFreehandPoint(Geom::Point const &p, guint /*state*/, bool l - min = max; - } - double dezoomify_factor = 0.05 * 1000 / _desktop->current_zoom(); -- double const pressure_shrunk = pressure * (max - min) + min; // C++20 -> use std::lerp() -+ double const pressure_shrunk = std::lerp(min, max, pressure); - double pressure_computed = std::abs(pressure_shrunk * dezoomify_factor); - double pressure_computed_scaled = std::abs(pressure_computed * _desktop->getDocument()->getDocumentScale().inverse()[Geom::X]); - if (p != p_array[_npoints - 1]) { --- -GitLab - diff --git a/srcpkgs/inkscape/patches/inkscape-1.3.2-poppler-24.03.patch b/srcpkgs/inkscape/patches/inkscape-1.3.2-poppler-24.03.patch deleted file mode 100644 index c867bcd600f..00000000000 --- a/srcpkgs/inkscape/patches/inkscape-1.3.2-poppler-24.03.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/extension/internal/pdfinput/svg-builder.cpp 2023-11-25 13:17:23.000000000 +0100 -+++ b/src/extension/internal/pdfinput/svg-builder.cpp 2024-08-23 18:27:43.504605248 +0200 -@@ -1158,9 +1158,13 @@ - #define INT_EPSILON 8 - bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, - _POPPLER_CONST Function *func) { -- int type = func->getType(); -+ auto type = func->getType(); - auto space = shading->getColorSpace(); -+#if POPPLER_CHECK_VERSION(24, 3, 0) -+ if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) { // Sampled or exponential function -+#else - if ( type == 0 || type == 2 ) { // Sampled or exponential function -+#endif - GfxColor stop1, stop2; - if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) { - return false; -@@ -1168,7 +1172,11 @@ - _addStopToGradient(gradient, 0.0, &stop1, space, 1.0); - _addStopToGradient(gradient, 1.0, &stop2, space, 1.0); - } -- } else if ( type == 3 ) { // Stitching -+#if POPPLER_CHECK_VERSION(24, 3, 0) -+ } else if ( type == Function::Type::Stitching ) { // Stitching -+#else -+ } else if ( type == 3 ) { // Stitching -+#endif - auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func); - const double *bounds = stitchingFunc->getBounds(); - const double *encode = stitchingFunc->getEncode(); -@@ -1183,7 +1191,11 @@ - for ( int i = 0 ; i < num_funcs ; i++ ) { - svgGetShadingColor(shading, bounds[i + 1], &color); - // Add stops -+#if POPPLER_CHECK_VERSION(24, 3, 0) -+ if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) { // process exponential fxn -+#else - if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn -+#endif - double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE(); - if (expE > 1.0) { - expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1 diff --git a/srcpkgs/inkscape/patches/inkscape-1.3.2-poppler-24.05.patch b/srcpkgs/inkscape/patches/inkscape-1.3.2-poppler-24.05.patch deleted file mode 100644 index bb2764032c4..00000000000 --- a/srcpkgs/inkscape/patches/inkscape-1.3.2-poppler-24.05.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 96ca7a6c215aa14336b52753f56244dc8796ec43 Mon Sep 17 00:00:00 2001 -From: Heiko Becker -Date: Fri, 3 May 2024 14:52:00 +0200 -Subject: [PATCH] Fix build with poppler >= 24.05.0 - -GooString::hasUnicodeMarkerLE and GooString::hasUnicodeMarker were -rename and moved to UTF.h [1][2] - -[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/98fabb298b0e8eaef9193bbce68c99c85473a314 -[2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/1f06dca08c32ed18c3030530d98a0e30d41dd7a2 ---- - src/extension/internal/pdfinput/poppler-transition-api.h | 9 +++++++++ - src/extension/internal/pdfinput/poppler-utils.cpp | 6 ++++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h -index 58aa1ec921d..481aefadf46 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -13,6 +13,15 @@ - #define SEEN_POPPLER_TRANSITION_API_H - - #include -+#include -+ -+#if POPPLER_CHECK_VERSION(24, 5, 0) -+#define _POPPLER_HAS_UNICODE_BOM(value) (hasUnicodeByteOrderMark(value->toStr())) -+#define _POPPLER_HAS_UNICODE_BOMLE(value) (hasUnicodeByteOrderMarkLE(value->toStr())) -+#else -+#define _POPPLER_HAS_UNICODE_BOM(value) (value->hasUnicodeMarker()) -+#define _POPPLER_HAS_UNICODE_BOMLE(value) (value->hasUnicodeMarkerLE()) -+#endif - - #if POPPLER_CHECK_VERSION(24, 3, 0) - #define _POPPLER_FUNCTION_TYPE_SAMPLED Function::Type::Sampled -diff --git a/src/extension/internal/pdfinput/poppler-utils.cpp b/src/extension/internal/pdfinput/poppler-utils.cpp -index 78d90c66c9d..c02815f64b9 100644 ---- a/src/extension/internal/pdfinput/poppler-utils.cpp -+++ b/src/extension/internal/pdfinput/poppler-utils.cpp -@@ -12,6 +12,8 @@ - - #include "poppler-utils.h" - -+#include -+ - #include "2geom/affine.h" - #include "GfxFont.h" - #include "GfxState.h" -@@ -563,10 +565,10 @@ std::string getDictString(Dict *dict, const char *key) - */ - std::string getString(const GooString *value) - { -- if (value->hasUnicodeMarker()) { -+ if (_POPPLER_HAS_UNICODE_BOM(value)) { - return g_convert(value->getCString () + 2, value->getLength () - 2, - "UTF-8", "UTF-16BE", NULL, NULL, NULL); -- } else if (value->hasUnicodeMarkerLE()) { -+ } else if (_POPPLER_HAS_UNICODE_BOMLE(value)) { - return g_convert(value->getCString () + 2, value->getLength () - 2, - "UTF-8", "UTF-16LE", NULL, NULL, NULL); - } --- -GitLab - diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 4ea73a51ae7..fe2cc2c43d7 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape -version=1.3.2 -revision=4 +version=1.4 +revision=1 build_style=cmake make_check_target="check" hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel @@ -11,16 +11,17 @@ makedepends="aspell-devel cairomm-devel double-conversion-devel gc-devel hunspell-devel libatomic_ops-devel libcdr-devel libgomp-devel libvisio-devel libwpd-devel libwpd-devel libwpg-devel libxslt-devel pango-devel poppler-devel poppler-glib-devel potrace-devel gtest-devel gtksourceview4-devel - boost-devel lib2geom-devel popt-devel readline-devel libxml2-devel libsoup-devel" + boost-devel lib2geom-devel popt-devel readline-devel libxml2-devel" depends="desktop-file-utils hicolor-icon-theme python3-Pillow python3-appdirs - python3-cssselect python3-lxml python3-numpy python3-requests python3-scour" -checkdepends="$depends GraphicsMagick ImageMagick cantarell-fonts gtest-devel" + python3-cssselect python3-lxml python3-numpy python3-requests python3-scour + python3-tinycss2" +checkdepends="$depends GraphicsMagick ImageMagick cantarell-fonts gtest-devel bc" short_desc="Vector-based drawing program" maintainer="Alex Lohr " license="GPL-2.0-only, LGPL-2.1-or-later" homepage="https://inkscape.org/" distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz" -checksum=dbd1844dc443fe5e10d3e9a887144e5fb7223852fff191cfb5ef7adeab0e086b +checksum=c59a85453b699addebcd51c1dc07684dd96a10c8aec716b19551db50562e13f5 python_version=3 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 make_check=no diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template index fae619484a2..4a7c6d5a5a3 100644 --- a/srcpkgs/instaloader/template +++ b/srcpkgs/instaloader/template @@ -1,6 +1,6 @@ # Template file for 'instaloader' pkgname=instaloader -version=4.13.1 +version=4.14 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="fosslinux " license="MIT" homepage="https://instaloader.github.io" distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz" -checksum=36774ea1076eeb236f8782d221e3737f71ddc023042f0b13761429ef137f1133 +checksum=754425eb17af44ce4bb6056e4eacd044a518d13b5efc11b9d80eb229bb96c652 post_install() { vlicense LICENSE diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index 5e7a9d6f7a7..c929a6d0129 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -1,6 +1,6 @@ # Template file for 'intel-ucode' pkgname=intel-ucode -version=20240910 +version=20241112 revision=1 archs="i686* x86_64*" short_desc="Microcode update files for Intel CPUs" @@ -9,7 +9,7 @@ license="custom: Proprietary" homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files" changelog="https://raw.githubusercontent.com/intel/Intel-Linux-Processor-Microcode-Data-Files/main/releasenote.md" distfiles="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/refs/tags/microcode-${version}.tar.gz" -checksum=8b7582eac7e9a691356e18b3bdcbc7b2db09494e040ec980a4a5fb6d0da261bf +checksum=37246208ef68039be752438c72400a688a2238df13a7f5282497c80be2d8366d repository=nonfree do_install() { diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template index 26b50863498..02f8d8d6d94 100644 --- a/srcpkgs/intellij-idea-community-edition/template +++ b/srcpkgs/intellij-idea-community-edition/template @@ -1,6 +1,6 @@ # Template file for 'intellij-idea-community-edition' pkgname=intellij-idea-community-edition -version=2024.2.2 +version=2024.3 revision=1 archs="x86_64" depends="virtual?java-environment giflib libXtst hicolor-icon-theme" @@ -9,7 +9,7 @@ maintainer="Bnyro " license="Apache-2.0" homepage="https://www.jetbrains.org/" distfiles="https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz" -checksum=b996f6418cd4beb8d77f5f283c0a37108e33b3c822a7d398dfa15b73967595b2 +checksum=16d4f411b62ddc7747fe11e8fff004bf8d144df4052b8111306fd4cbba8f748c repository=nonfree nopie=yes python_version=3 diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index 90bf941f92d..14ee206c040 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -1,6 +1,6 @@ # Template file for 'io.elementary.code' pkgname=io.elementary.code -version=7.2.0 +version=7.3.0 revision=1 build_style=meson build_helper=gir @@ -14,7 +14,7 @@ maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/code" distfiles="https://github.com/elementary/code/archive/${version}.tar.gz" -checksum=8869e9a22e1d26beba1bb04e8c0a4e17a5f467d33fc63ed8cb321df130f743e4 +checksum=3cf6abdb91db9a14ab01b353cd39b8da6485c176af5cb67c48ac851656cc1883 pre_patch() { sed -i '/subdir.*pastebin/d' plugins/meson.build diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template index bd07511872c..5b134fe13ee 100644 --- a/srcpkgs/ircdog/template +++ b/srcpkgs/ircdog/template @@ -1,7 +1,7 @@ # Template file for 'ircdog' pkgname=ircdog -version=0.5.4 -revision=2 +version=0.5.5 +revision=1 build_style=go go_import_path="github.com/ergochat/ircdog" short_desc="Simple wrapper over the raw IRC protocol" @@ -10,7 +10,7 @@ license="ISC" homepage="https://github.com/ergochat/ircdog" changelog="https://raw.githubusercontent.com/ergochat/ircdog/master/CHANGELOG.md" distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz" -checksum=700f1bfda4a26b66f8bbe4551ec2bc6f5b093cc3a6f2f1deff53135e84d463e5 +checksum=cc75fc53dfaeca27469b42db3596bc42a26259a6534c3edecf8d91bf6b52a4fe post_install() { vlicense LICENSE diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template index 25e8f267896..d69272b2e95 100644 --- a/srcpkgs/ispc/template +++ b/srcpkgs/ispc/template @@ -1,6 +1,6 @@ # Template file for 'ispc' pkgname=ispc -version=1.25.1 +version=1.25.3 revision=1 archs="aarch64* x86_64*" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="BSD-3-Clause" homepage="https://ispc.github.io" distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz" -checksum=77e094f9324bbdd40ad56f80039f94d9f6621cf8a56e1c57168e2b4d10752f9f +checksum=6f00038e0e86e90474f3117c3b393f6695a8fbe1b3d8fe3b1a0baf197dfb7557 nocross=yes nopie=yes diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index ece76b1ebac..47ae974258c 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,6 +1,6 @@ # Template file for 'iwd' pkgname=iwd -version=2.20 +version=3.1 revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-pie @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://iwd.wiki.kernel.org/" changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog" distfiles="${KERNEL_SITE}/network/wireless/iwd-${version}.tar.xz" -checksum=86827b97cb5b19ddecce36568c59378da2fae8cf37a0e2b9eacd1269f24c6f8e +checksum=a2b6d21315fdd0e060d5f75f5a0cc55018ea9d112a080f2ccd6dae2e1d923ac5 make_dirs="/var/lib/iwd 0600 root root /var/lib/ead 0600 root root /etc/iwd 755 root root" diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template index eba24fd047b..874f6507008 100644 --- a/srcpkgs/jadx/template +++ b/srcpkgs/jadx/template @@ -1,6 +1,6 @@ # Template file for 'jadx' pkgname=jadx -version=1.5.0 +version=1.5.1 revision=1 hostmakedepends="openjdk11 gradle" short_desc="Decompiler for Dalvik bytecode" @@ -8,7 +8,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://github.com/skylot/jadx" distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz" -checksum=7b72f104d7e735ff329b3cbd286364e88073e5db2d5c86d6596c24371065197d +checksum=8bf962d32a90b5b3447c1118a0db8a5186f0ddb4c83a4b2713ca72586a2fb6a3 do_build() { gradle copyArtifacts diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template index a01176c0d7b..91291c74a0a 100644 --- a/srcpkgs/jujutsu/template +++ b/srcpkgs/jujutsu/template @@ -1,6 +1,6 @@ # Template file for 'jujutsu' pkgname=jujutsu -version=0.22.0 +version=0.23.0 revision=1 build_style=cargo build_helper=qemu @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://github.com/martinvonz/jj" changelog="https://github.com/martinvonz/jj/blob/main/CHANGELOG.md" distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz" -checksum=ed49b1c01ee6086bb782a465a4437e2f1b66f43bcf39c231df2b261091ab114b +checksum=18e0cc5600c06e940defce0a23ab4b29885bac265f94176603e5f8f926ed000e conflicts="jj>=0" do_install() { diff --git a/srcpkgs/just/template b/srcpkgs/just/template index 08e2581f253..19cbd0a271f 100644 --- a/srcpkgs/just/template +++ b/srcpkgs/just/template @@ -1,6 +1,6 @@ # Template file for 'just' pkgname=just -version=1.35.0 +version=1.36.0 revision=1 build_style=cargo build_helper=qemu @@ -12,7 +12,7 @@ license="CC0-1.0" homepage="https://github.com/casey/just" changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md" distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz" -checksum=f1ce3fe46c57cba0096227f8c9251d3b476e54e8a620eb39707d0ab3e16b8f55 +checksum=bc2e2ff0268c2818659c524b21663564864b50ba102afb0a44fe73c08cf35ff0 make_check=ci-skip # test fails when run as root # Fix failing test diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template index e5dfede6dd9..e77b15f9815 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,6 +1,6 @@ # Template file for 'justbuild' pkgname=justbuild -version=1.3.2 +version=1.4.0 revision=1 create_wrksrc=yes hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf" @@ -13,7 +13,7 @@ license="Apache-2.0" homepage="https://github.com/just-buildsystem/justbuild/" changelog="https://github.com/just-buildsystem/justbuild/blob/master/CHANGELOG.md" distfiles="https://github.com/just-buildsystem/justbuild/archive/v${version}.tar.gz" -checksum=3c17057a1667dd3d4c6dc527eba823367174ecc0bd8ed35632ac03aba5f99201 +checksum=62e8f12c9da5d2eb30f81b3c19ba060af3d045e1a6aeafd0ef2661dd7f5280e7 conflicts="just>=0" nocross="not supported by bootstrapping" diff --git a/srcpkgs/jwm/template b/srcpkgs/jwm/template index cfdc310bc2c..e8150fc6511 100644 --- a/srcpkgs/jwm/template +++ b/srcpkgs/jwm/template @@ -1,6 +1,6 @@ # Template file for 'jwm' pkgname=jwm -version=2.4.3 +version=2.4.5 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config which" @@ -14,7 +14,7 @@ license="MIT" conf_files="/etc/system.jwmrc" homepage="http://joewing.net/projects/jwm" distfiles="https://github.com/joewing/jwm/releases/download/v${version}/jwm-${version}.tar.xz" -checksum=ee3b4ee0c452ef31fcb9303ab50aaf496cf5bdf7b5f1fdc9a1251b7175ca67ab +checksum=9a1a708085d101c5f7f986b00feb8a6c35df767c5784d4bb439257af9e9e50c1 post_install() { vinstall ${FILESDIR}/jwm.desktop 644 usr/share/xsessions diff --git a/srcpkgs/kak-lsp/template b/srcpkgs/kak-lsp/template index f0c66498483..c4e59ed38c2 100644 --- a/srcpkgs/kak-lsp/template +++ b/srcpkgs/kak-lsp/template @@ -1,6 +1,6 @@ # Template file for 'kak-lsp' pkgname=kak-lsp -version=17.1.2 +version=18.0.3 revision=1 build_style=cargo short_desc="Language Server Protocol client for Kakoune" @@ -9,9 +9,10 @@ license="Unlicense" homepage="https://github.com/kakoune-lsp/kakoune-lsp" changelog="https://raw.githubusercontent.com/kakoune-lsp/kakoune-lsp/master/CHANGELOG.md" distfiles="https://github.com/kakoune-lsp/kakoune-lsp/archive/v${version}.tar.gz" -checksum=2a7c83eb1eb7e0e119879ee9be9b0868c07028c4925c317a78e7f2bbe8dc7d0f +checksum=75de62446a3eabc0e96b170b5d9c18cd37dabcbfbaa2a9e50240a00dab271a93 post_install() { vlicense UNLICENSE - vsconf kak-lsp.toml + vsconf rc/servers.kak + vsconf rc/lsp.kak } diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template index 416218fe68d..dcd35e3adc8 100644 --- a/srcpkgs/kapidox/template +++ b/srcpkgs/kapidox/template @@ -1,6 +1,6 @@ # Template file for 'kapidox' pkgname=kapidox -version=6.6.0 +version=6.7.0 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools" @@ -12,7 +12,7 @@ maintainer="John " license="BSD-2-Clause, CC0-1.0" homepage="https://invent.kde.org/frameworks/kapidox" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e79c9dabb6db31708389dd47a8bdd48d16a60a02e5cb2b55f347d03a6fc7e2b7 +checksum=7338f1e318eb2d24cb95b56d5306a61d0a192e90977bead60517741c8305e240 make_check=no # requires doxyqml (which is not packaged in void repos) post_install() { diff --git a/srcpkgs/kbounce/template b/srcpkgs/kbounce/template index dd1b38bb755..4638f2e286a 100644 --- a/srcpkgs/kbounce/template +++ b/srcpkgs/kbounce/template @@ -1,6 +1,6 @@ # Template file for 'kbounce' pkgname=kbounce -version=24.08.2 +version=24.08.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake @@ -18,4 +18,4 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="https://apps.kde.org/kbounce/" distfiles="${KDE_SITE}/release-service/${version}/src/kbounce-${version}.tar.xz" -checksum=10cbd6ca00df8a5e35714526d2a9449883a892f759d26b182f83e137ea5b21d1 +checksum=ca25c64a148183f69f1afcce7551b73ab7bbb9b233e12f4448f63aa3aa9d2adb diff --git a/srcpkgs/kf6-attica/template b/srcpkgs/kf6-attica/template index c48399f75d8..deba9a15f10 100644 --- a/srcpkgs/kf6-attica/template +++ b/srcpkgs/kf6-attica/template @@ -1,6 +1,6 @@ # Template file for 'kf6-attica' pkgname=kf6-attica -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/attica" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=e2370e7f0a0e4721180c364342f47bc974cf3b45c45c7ce9e70c5d9ba5230be3 +checksum=daa5c07b474899e16b42710e03d0590936bce0f54800239d633d48caa3be0d7d do_check() { diff --git a/srcpkgs/kf6-baloo/template b/srcpkgs/kf6-baloo/template index c4c451d3745..9a1a1557029 100644 --- a/srcpkgs/kf6-baloo/template +++ b/srcpkgs/kf6-baloo/template @@ -1,6 +1,6 @@ # Template file for 'kf6-baloo' pkgname=kf6-baloo -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake @@ -16,7 +16,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/baloo" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=7b097526d1c8c90cdb8126a941ff4e159f800fcfff6f812668373d7b9b5bb719 +checksum=ce8c18a21ed7acd5912c7d273cac5f6cb1adb524a0415d56c6fdde2e967f67cc do_check() { cd build diff --git a/srcpkgs/kf6-bluez-qt/template b/srcpkgs/kf6-bluez-qt/template index 54a1909f111..75b19411a42 100644 --- a/srcpkgs/kf6-bluez-qt/template +++ b/srcpkgs/kf6-bluez-qt/template @@ -1,6 +1,6 @@ # Template file for 'kf6-bluez-qt' pkgname=kf6-bluez-qt -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml" @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/bluez-qt" #changelog="" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=1a2a805ba12639c1784d2f549f5e98f210fc8d1878c5ca770936eac827c8eb00 +checksum=b0640106986213e1b28f2cba13d9cc22ee3d259755f27521f2e861634338f93b do_check() { cd build diff --git a/srcpkgs/kf6-frameworkintegration/template b/srcpkgs/kf6-frameworkintegration/template index d1eb6bbc4a0..9d9e3a13388 100644 --- a/srcpkgs/kf6-frameworkintegration/template +++ b/srcpkgs/kf6-frameworkintegration/template @@ -1,6 +1,6 @@ # Template file for 'kf6-frameworkintegration' pkgname=kf6-frameworkintegration -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/frameworkintegration" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=ea594c3957a09fdcb85711d4bdff6d923c0e3eb8ec496e5686585fc56723d3a0 +checksum=890101854bbbb3937d321f2ac35b2a0a8f3ce833422297ddda59bda8c8cac69d kf6-frameworkintegration-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-karchive/template b/srcpkgs/kf6-karchive/template index 0a9a6dd57d7..238fe59079b 100644 --- a/srcpkgs/kf6-karchive/template +++ b/srcpkgs/kf6-karchive/template @@ -1,6 +1,6 @@ # Template file for 'kf6-karchive' pkgname=kf6-karchive -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/karchive" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=51e9d21cb87e2241bca6a69e1496661d05d00a581107bfcf9859aa9e70acac1b +checksum=eb4243e627f51f1224a99af5d0a6f8e309f9e5dbb7478f7a78e34e2b8541398a kf6-karchive-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kauth/template b/srcpkgs/kf6-kauth/template index 2554ec2fc80..f5cf8680846 100644 --- a/srcpkgs/kf6-kauth/template +++ b/srcpkgs/kf6-kauth/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kauth' pkgname=kf6-kauth -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kauth" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=04fb5e3ff672f31f6c3f2e40a59d9c7447a5251b99dbe5f5ea67f54a4c981f3a +checksum=173654eee2891acd41538d31ace8b9d7ae60863bc7faef1cacec7e21c7eb1223 subpackages="kf6-kauth-tools kf6-kauth-devel" do_check() { diff --git a/srcpkgs/kf6-kbookmarks/template b/srcpkgs/kf6-kbookmarks/template index e065ed07df0..187224c8846 100644 --- a/srcpkgs/kf6-kbookmarks/template +++ b/srcpkgs/kf6-kbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kbookmarks' pkgname=kf6-kbookmarks -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kbookmarks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=32d0b4ca746db2b2bd2a4e5282f4acaba084b9ca104495a2b450b9ae2456b7d7 +checksum=bd41a39df76515ee34e7df07b2600e1e5b67b1812cc959ec51585f2ebcc56573 kf6-kbookmarks-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kcalendarcore/template b/srcpkgs/kf6-kcalendarcore/template index d49d2d644af..a140620c1cc 100644 --- a/srcpkgs/kf6-kcalendarcore/template +++ b/srcpkgs/kf6-kcalendarcore/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kcalendarcore' pkgname=kf6-kcalendarcore -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcalendarcore" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=1ab6390411f8681e0559cc7b3c2f3b4384d607a408681077535ff993606362f8 +checksum=8e5282d8d7a0ce0a1a1bdb32133ba4102d06070105513e712dafe76e32647dfb do_check() { cd build diff --git a/srcpkgs/kf6-kcmutils/template b/srcpkgs/kf6-kcmutils/template index 6607fa86f8e..1654c82eff3 100644 --- a/srcpkgs/kf6-kcmutils/template +++ b/srcpkgs/kf6-kcmutils/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kcmutils' pkgname=kf6-kcmutils -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake build_helper=qemu @@ -16,7 +16,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcmutils" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=8f1b9f26ce7b055cec46a9521eab75f910ae9c395aada88d6d82cf395459b270 +checksum=4118388f8f62aa5f1139ed78823b58b009e9ebf7f3755e9a94ab5f9eba644cbe kf6-kcmutils-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kcodecs/template b/srcpkgs/kf6-kcodecs/template index 1cf61bcbb3f..b0fe86a06cf 100644 --- a/srcpkgs/kf6-kcodecs/template +++ b/srcpkgs/kf6-kcodecs/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kcodecs' pkgname=kf6-kcodecs -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcodecs" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=d9dc2e3294aa32684990bde01bb88dedb2610a28d7c1d62a178a393fa566123b +checksum=9ab494055e06bdce45568b7c47edb2aa9ecaa9dec0c0fb152367b4321921b9f2 kf6-kcodecs-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kcolorscheme/template b/srcpkgs/kf6-kcolorscheme/template index fb84e812ce1..1cc1a43ada3 100644 --- a/srcpkgs/kf6-kcolorscheme/template +++ b/srcpkgs/kf6-kcolorscheme/template @@ -1,17 +1,18 @@ # Template file for 'kf6-kcolorscheme' pkgname=kf6-kcolorscheme -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base gettext" -makedepends="kf6-kconfig-devel kf6-kguiaddons-devel kf6-ki18n-devel" +makedepends="kf6-kconfig-devel kf6-kguiaddons-devel kf6-ki18n-devel + qt6-base-private-devel" short_desc="Classes to read and interact with KColorScheme" maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcolorscheme" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=657839e1ff8141ff09705be912e276a2dc98df122f5bcc2fdc3ed11d10100cd1 +checksum=1b4c6e84f1dd96b2ee62be755f60da60d61ba80d6709eeb3186d8882e72e2130 kf6-kcolorscheme-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kcompletion/template b/srcpkgs/kf6-kcompletion/template index c0484602a3b..7baa269165b 100644 --- a/srcpkgs/kf6-kcompletion/template +++ b/srcpkgs/kf6-kcompletion/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kcompletion' pkgname=kf6-kcompletion -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcompletion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=b80659b31fad437d19ec9486405d49f8db0cea709629e3b4ff0eb292ccf10b43 +checksum=7ed5a96ab0d2ab17bb521ecaaf44d6ec6b7c9a3d6e09403360ba49b24d94560f kf6-kcompletion-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kconfig/template b/srcpkgs/kf6-kconfig/template index d223453f592..a3e41423b1f 100644 --- a/srcpkgs/kf6-kconfig/template +++ b/srcpkgs/kf6-kconfig/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kconfig' pkgname=kf6-kconfig -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=070bd019b07e15201e4c7072b71337c75f6917407406a1a7107fca1bff2855fe +checksum=be2d5ddb63e56703bc097e5d9912b39abc513ac51654de2e0d83a1aed2c54b1b do_check() { cd build diff --git a/srcpkgs/kf6-kconfigwidgets/template b/srcpkgs/kf6-kconfigwidgets/template index 727cc5de400..060bf0b8134 100644 --- a/srcpkgs/kf6-kconfigwidgets/template +++ b/srcpkgs/kf6-kconfigwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kconfigwidgets' pkgname=kf6-kconfigwidgets -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kconfigwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=83b141867609a8e63e3cbe874e519f2d3d8a53ff7dce958b8157c697d5cc5872 +checksum=c079c67c578930baafae241bb4f252c63fdd125e44f1fb952e39bae3c9859cd1 do_check() { cd build diff --git a/srcpkgs/kf6-kcontacts/template b/srcpkgs/kf6-kcontacts/template index 0658e045c7b..73004ffc5a0 100644 --- a/srcpkgs/kf6-kcontacts/template +++ b/srcpkgs/kf6-kcontacts/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kcontacts' pkgname=kf6-kcontacts -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcontacts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=99f0527d49bc6b3fbdc91c4b7edb67c86936e7a4c8cd881bd9da2eedf5666d6c +checksum=292f8104f9f31d62c59289a3a821766d1ec540f4fc513ffc3b6f7197602d42c5 do_check() { cd build diff --git a/srcpkgs/kf6-kcoreaddons/template b/srcpkgs/kf6-kcoreaddons/template index 97653b3b935..87f979d396a 100644 --- a/srcpkgs/kf6-kcoreaddons/template +++ b/srcpkgs/kf6-kcoreaddons/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kcoreaddons' pkgname=kf6-kcoreaddons -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcoreaddons" #changelog="" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=5aba9abf934e2daf5f70837cbac088607fe8bd505e172c4af6cdaacdda25c50b +checksum=48511e9dab1f2e80b3c4822bb87c2e981186de3b8977d92082d34d003b1283c5 do_check() { cd build diff --git a/srcpkgs/kf6-kcrash/template b/srcpkgs/kf6-kcrash/template index 30c3a429750..8805e632375 100644 --- a/srcpkgs/kf6-kcrash/template +++ b/srcpkgs/kf6-kcrash/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kcrash' pkgname=kf6-kcrash -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcrash" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=fb4acaf670a8e1f61b7ab21fcc6cf1320d2f6645a0372a94623c60df7b0898de +checksum=1dc2c65d8ef62ef98457f8ab423b7686de3e713766c06e64d6322aa9db26eea4 kf6-kcrash-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kdav/template b/srcpkgs/kf6-kdav/template index 7bc83c0fc63..76f0064cc09 100644 --- a/srcpkgs/kf6-kdav/template +++ b/srcpkgs/kf6-kdav/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kdav' pkgname=kf6-kdav -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdav" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=825ed9de5fc94e228fccd4af48cf7c101c0bbe37bbf6385cf81820bbeaf778e7 +checksum=6629f2af0042eb1e0dc0c08b5180ac7b48dae6b5999e1dd0b678aed8b874c1d7 replaces="kdav>=0" kf6-kdav-devel_package() { diff --git a/srcpkgs/kf6-kdbusaddons/template b/srcpkgs/kf6-kdbusaddons/template index 31c6f283804..5863b840a4e 100644 --- a/srcpkgs/kf6-kdbusaddons/template +++ b/srcpkgs/kf6-kdbusaddons/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kdbusaddons' pkgname=kf6-kdbusaddons -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdbusaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=521315f80d31e2db4e4344ebf2436a22e75475b70edabe8157f4afb4a2cb42ad +checksum=e87d08f6d0037d8fa33f1e7d16a4e3aa17d7d0b12c6aa96f76323f78344e151b make_check_pre="dbus-run-session" kf6-kdbusaddons-devel_package() { diff --git a/srcpkgs/kf6-kdeclarative/template b/srcpkgs/kf6-kdeclarative/template index ac5e5c54bec..e245ae00f7a 100644 --- a/srcpkgs/kf6-kdeclarative/template +++ b/srcpkgs/kf6-kdeclarative/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kdeclarative' pkgname=kf6-kdeclarative -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdeclarative" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=3a8a3215e5a5ae9a2e7e67b17a8feab6411d729df0367102e094c8d7a5ff58b6 +checksum=f1f804f6bac2b229503cfd165ebd8ae093533888ae15e0e61474c6e328d535b9 kf6-kdeclarative-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kded/template b/srcpkgs/kf6-kded/template index 7d6713dc7fc..2ad830b6c61 100644 --- a/srcpkgs/kf6-kded/template +++ b/srcpkgs/kf6-kded/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kded' pkgname=kf6-kded -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kded" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=cc963975f80de1906e8b39970579af211138c582b1630daf280ba299b2d3f9fe +checksum=22aa1b6543b40e094346138516131c0f7eb78a70e87296938457fd1386680a2f kf6-kded-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kdesu/template b/srcpkgs/kf6-kdesu/template index dee88c15b1c..dcff7582fe5 100644 --- a/srcpkgs/kf6-kdesu/template +++ b/srcpkgs/kf6-kdesu/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kdesu' pkgname=kf6-kdesu -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdesu" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=d5ac127e3b218da7a785fa606490b052c09d481bcff0227b45d42ef0e3f34a5f +checksum=41091ea45c6e22e1411d89d1538b2c8bd98bdc1f38d59df3e9c423aac0224e28 kf6-kdesu-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kdnssd/template b/srcpkgs/kf6-kdnssd/template index c32f8df1ad4..ad1cc02a8cc 100644 --- a/srcpkgs/kf6-kdnssd/template +++ b/srcpkgs/kf6-kdnssd/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kdnssd' pkgname=kf6-kdnssd -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdnssd" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=3743ea3f156358d6945df69e67c98c69f438413620c6ac7286d0427342157fc7 +checksum=e9140475fc6e4ee1e0fe39a21816a3c003fcb1092222079f422fd02ad2a902a1 kf6-kdnssd-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kdoctools/template b/srcpkgs/kf6-kdoctools/template index 4f4fef64ce1..b7c2f3c580b 100644 --- a/srcpkgs/kf6-kdoctools/template +++ b/srcpkgs/kf6-kdoctools/template @@ -1,7 +1,7 @@ # Template file for 'kf6-kdoctools' pkgname=kf6-kdoctools -version=6.6.0 -revision=2 +version=6.7.0 +revision=1 build_style=cmake build_helper=qemu hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdoctools" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=149e0b442290f8bc9d2a0c99c8e27a5735a3a83870a82de007e487529f0aad44 +checksum=9fe539dffed01836940fa4f06f953ac4ed0cd4fb5f0232fe5b66c22364c1692f post_patch() { vsed -i -e ' diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template index 303fa2c8a78..8500a04a062 100644 --- a/srcpkgs/kf6-kfilemetadata/template +++ b/srcpkgs/kf6-kfilemetadata/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kfilemetadata' pkgname=kf6-kfilemetadata -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kfilemetadata" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=218ccbc926e1e26765f7213b8aace7ebdaa785464efad2bb60f8e648362cfea0 +checksum=a6242a79e672b523ebf1b2554ebf83aca7a9d5065929b6f152731e9851d008d0 do_check() { cd build diff --git a/srcpkgs/kf6-kglobalaccel/template b/srcpkgs/kf6-kglobalaccel/template index 246c0a6d611..cc3d46c9b4b 100644 --- a/srcpkgs/kf6-kglobalaccel/template +++ b/srcpkgs/kf6-kglobalaccel/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kglobalaccel' pkgname=kf6-kglobalaccel -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kglobalaccel" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=49295ea5e4a018222a9b483e7c0fb8e7cfb4b761a92920b1e13454fd8f85fe81 +checksum=2a35b9e06c6601d602b3a45e278c49e11e4627939cfacffb1fdee0826a6f6e0b kf6-kglobalaccel-devel_package() { depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kguiaddons/template b/srcpkgs/kf6-kguiaddons/template index e4942528494..68d30055ee4 100644 --- a/srcpkgs/kf6-kguiaddons/template +++ b/srcpkgs/kf6-kguiaddons/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kguiaddons' pkgname=kf6-kguiaddons -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kguiaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=bcaa36e4c046a4adadbe6bbb8649169c1b1b96ab68953e3ea1957d7b87c18331 +checksum=ac437ca6baf50b0178bc8bf0b4dd1e6e70e0e4ef1ac770259738a1c42d035bcc kf6-kguiaddons-geo-uri-handler_package() { short_desc+=" - Geo URI handler" diff --git a/srcpkgs/kf6-kholidays/template b/srcpkgs/kf6-kholidays/template index 387af849625..92c11cdd2eb 100644 --- a/srcpkgs/kf6-kholidays/template +++ b/srcpkgs/kf6-kholidays/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kholidays' pkgname=kf6-kholidays -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kholidays" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=712b2be318997022be28374195a49e8c7ca2a130295aab6ace7b88d7ec0f2b0f +checksum=2b543dfdeb6a52f4101fdf9f14802dd759d0a9fff060ea371f1f3b900dd335ab kf6-kholidays-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-ki18n/template b/srcpkgs/kf6-ki18n/template index cdfb55bed7c..fa767a002a1 100644 --- a/srcpkgs/kf6-ki18n/template +++ b/srcpkgs/kf6-ki18n/template @@ -1,6 +1,6 @@ # Template file for 'kf6-ki18n' pkgname=kf6-ki18n -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ki18n" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=582b4c58bb69803412322d3db656fd4f5fde154eac1ac89b2c6bc905c5b61e6e +checksum=555b5bc19546c3a791c69724e238c5d1710a9575cf8740012f8fc546f354122b do_check() { cd build diff --git a/srcpkgs/kf6-kiconthemes/template b/srcpkgs/kf6-kiconthemes/template index 6d0cf754777..8829ab347a4 100644 --- a/srcpkgs/kf6-kiconthemes/template +++ b/srcpkgs/kf6-kiconthemes/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kiconthemes' pkgname=kf6-kiconthemes -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kiconthemes" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=2d00b17929d886425395e96c4c18bf5e8dfbf3f1cac2dac199a6f2ac5af35b22 +checksum=be25bff1f5f65edd45b24ff9beda44b04c0e22d193e72458c96a5c591b70b968 kf6-kiconthemes-devel_package() { depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kidletime/template b/srcpkgs/kf6-kidletime/template index 7c50a76ab09..5d83117a9d5 100644 --- a/srcpkgs/kf6-kidletime/template +++ b/srcpkgs/kf6-kidletime/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kidletime' pkgname=kf6-kidletime -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kidletime" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=82480a6f06039c2b7e04a75c69f1151b1784edc7bcd27097ac6264b1aa15f427 +checksum=60a6c70387b63e61147029ce57f170237271411630a3372a0e8d7240b8006aaf kf6-kidletime-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" diff --git a/srcpkgs/kf6-kimageformats/template b/srcpkgs/kf6-kimageformats/template index b2b832b7ad7..63115975a2a 100644 --- a/srcpkgs/kf6-kimageformats/template +++ b/srcpkgs/kf6-kimageformats/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kimageformats' pkgname=kf6-kimageformats -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKIMAGEFORMATS_HEIF=ON -DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kimageformats" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=1b4cda14f96088f8de190c9be7fbe350a80a55c3ee2a8ff910da0d9992c4ddaf +checksum=722850648ac167e4c0ee631571fde49e9fd15d004a127dd804a14f9f579b731f do_check() { cd build diff --git a/srcpkgs/kf6-kio/template b/srcpkgs/kf6-kio/template index 6f0632e2d29..b9b4eaa3924 100644 --- a/srcpkgs/kf6-kio/template +++ b/srcpkgs/kf6-kio/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kio' pkgname=kf6-kio -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -20,7 +20,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kio" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=977f9f076eaf249ecdd961724334326c3f3a1e7d8cfcc6ca1370f390c76a2766 +checksum=df235019a07acd579920f6c655050e02dacf847c706f4b8279e755be46f9d990 do_check() { cd build diff --git a/srcpkgs/kf6-kirigami/template b/srcpkgs/kf6-kirigami/template index 90eff6f1ac7..2a04e702917 100644 --- a/srcpkgs/kf6-kirigami/template +++ b/srcpkgs/kf6-kirigami/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kirigami' pkgname=kf6-kirigami -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kirigami" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=9809cce703dfa8afe2c64e196f90c035850e2e432a9bd90ce32a40865368a7fe +checksum=4d645a0374d33b9465e79e3e17170882e2cbda1526f45bc5b6b176dadda77d76 kf6-kirigami-devel_package() { depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kitemmodels/template b/srcpkgs/kf6-kitemmodels/template index de0a105358e..613e6778d44 100644 --- a/srcpkgs/kf6-kitemmodels/template +++ b/srcpkgs/kf6-kitemmodels/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kitemmodels' pkgname=kf6-kitemmodels -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kitemmodels" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=fe0677bd6eaf2bccd350e7b80eebac382908fc2388af6716171ad77417ee7802 +checksum=0aa0205323baf2d519ebb8f96ce7ed5524a8164a7440d905f977418bfbe6d349 kf6-kitemmodels-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kitemviews/template b/srcpkgs/kf6-kitemviews/template index 8162bd25063..1d39f533fc3 100644 --- a/srcpkgs/kf6-kitemviews/template +++ b/srcpkgs/kf6-kitemviews/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kitemviews' pkgname=kf6-kitemviews -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="$(vopt_bool designerplugin BUILD_DESIGNERPLUGIN)" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kitemviews" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=a7a430c0c37b6781774ab7ee0845f9be0901424a5ed51d15e5b5b350d0cbee6e +checksum=5e635162993c9f1e15f3a1109ca3227d0d2ce57cf7070615651b65cf790db049 build_options="designerplugin" diff --git a/srcpkgs/kf6-kjobwidgets/template b/srcpkgs/kf6-kjobwidgets/template index b0fb8b8e89d..eaff55ea5f6 100644 --- a/srcpkgs/kf6-kjobwidgets/template +++ b/srcpkgs/kf6-kjobwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kjobwidgets' pkgname=kf6-kjobwidgets -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kjobwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=3c8eccd89d4118b6ecd619106f93a9b156df5899465b820d4b65d969813db515 +checksum=16d7e7ab54235d6fa1eb213d3d637182e22fcbdbcb7b4b14032430a02a2f888a kf6-kjobwidgets-devel_package() { depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-knewstuff/template b/srcpkgs/kf6-knewstuff/template index cc34737eff7..4a2c5b9c3dd 100644 --- a/srcpkgs/kf6-knewstuff/template +++ b/srcpkgs/kf6-knewstuff/template @@ -1,6 +1,6 @@ # Template file for 'kf6-knewstuff' pkgname=kf6-knewstuff -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knewstuff" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=3f927564b454c1fc1aeec05174b8f9e76303b4d9a45979d76b2188a25bd47025 +checksum=a4184622d430b64ec7cc4c77113df67c886f359cc89cc6313fbcc71764d23fa7 kf6-knewstuff-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-knotifications/template b/srcpkgs/kf6-knotifications/template index 022343ac0e3..9cacf775312 100644 --- a/srcpkgs/kf6-knotifications/template +++ b/srcpkgs/kf6-knotifications/template @@ -1,6 +1,6 @@ # Template file for 'kf6-knotifications' pkgname=kf6-knotifications -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifications" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=28153dce38eb488d228942a2ed197e57739107db1002448ad56bdd5be10bf60d +checksum=9e972f015d9b31b3283bf842a32d270096224d127c13a6e79450f4f0452de5e7 kf6-knotifications-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-knotifyconfig/template b/srcpkgs/kf6-knotifyconfig/template index 7aece019757..6d5969040bf 100644 --- a/srcpkgs/kf6-knotifyconfig/template +++ b/srcpkgs/kf6-knotifyconfig/template @@ -1,6 +1,6 @@ # Template file for 'kf6-knotifyconfig' pkgname=kf6-knotifyconfig -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifyconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=e032fc8ebd375cd406dfef3038ebd49d7c1d1de7c79b7cad4cccf00285006f1f +checksum=4227da7a18f9ba83b34bf54b6d3fc168dc0726bca149d2f89585bb54ab138295 kf6-knotifyconfig-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kpackage/template b/srcpkgs/kf6-kpackage/template index f72714ad755..fe142522eae 100644 --- a/srcpkgs/kf6-kpackage/template +++ b/srcpkgs/kf6-kpackage/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kpackage' pkgname=kf6-kpackage -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpackage" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=12d77241586dc12baa3aa2c65bcebea31604216b91b76d9aaaabf370673e9ed2 +checksum=916c11f5972760d9a5039643fbc55cde9d11ec18f278d3d63793336ffa442865 kf6-kpackage-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kparts/template b/srcpkgs/kf6-kparts/template index f84a286cd6b..72c2237a6e4 100644 --- a/srcpkgs/kf6-kparts/template +++ b/srcpkgs/kf6-kparts/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kparts' pkgname=kf6-kparts -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kparts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=d494def76a3a4c2e28bc9d4f889d6d4d9b644515fffb61169f429ce7b9bb22c7 +checksum=0b1b305050d61fcbefa7026b096dc6b47709d7435c69b18ab56a7e2ea57d759e kf6-kparts-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kpeople/template b/srcpkgs/kf6-kpeople/template index 141aa88b889..4d40b6851ba 100644 --- a/srcpkgs/kf6-kpeople/template +++ b/srcpkgs/kf6-kpeople/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kpeople' pkgname=kf6-kpeople -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpeople" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=a0f100a325190859c7754f6a94c38d07ce60f89f30e0d58ddf99641f1f16e2b0 +checksum=d36246bac50f5bf406f683fe61c92cb5e623a51de9ffed1104665e5f135ef888 do_check() { cd build diff --git a/srcpkgs/kf6-kplotting/template b/srcpkgs/kf6-kplotting/template index 5d1727b709e..df2ebe0153d 100644 --- a/srcpkgs/kf6-kplotting/template +++ b/srcpkgs/kf6-kplotting/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kplotting' pkgname=kf6-kplotting -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kplotting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=9275dd99cedb4fd53a00945e44ed694b5a27ada41604b2a54b2bcc5b4e2a3f79 +checksum=130eedc234f0fedaf2c415de895c979454f64c3b049043327d43cd509e2386b3 kf6-kplotting-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kpty/template b/srcpkgs/kf6-kpty/template index ed8546495cb..e502f1bdf5c 100644 --- a/srcpkgs/kf6-kpty/template +++ b/srcpkgs/kf6-kpty/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kpty' pkgname=kf6-kpty -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpty" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=63a1deb95284c8ff2fb77404a81183dd77d96458d05110b468742b3a0f755e61 +checksum=42cc1b1f70ee0bdacd26812857d31047d218e1f585ac35fe9165908501a9946a kf6-kpty-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kquickcharts/template b/srcpkgs/kf6-kquickcharts/template index 5cdcfefc58c..a594e2e9a02 100644 --- a/srcpkgs/kf6-kquickcharts/template +++ b/srcpkgs/kf6-kquickcharts/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kquickcharts' pkgname=kf6-kquickcharts -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kquickcharts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=d8441008d625763bf7b20a8b1685d09cd69416c6ce4603743e93c16fc5397a47 +checksum=664047e7b622c0b865d7466817179455fb3851cbb15a8f2c38b8ab9cf85098a4 kf6-kquickcharts-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-krunner/template b/srcpkgs/kf6-krunner/template index 33f7a29d809..4b9f13db738 100644 --- a/srcpkgs/kf6-krunner/template +++ b/srcpkgs/kf6-krunner/template @@ -1,6 +1,6 @@ # Template file for 'kf6-krunner' pkgname=kf6-krunner -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/krunner" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=17d4201be7ce712071d29e9528feafdc2be20391834a110c3584cc142c9f4b11 +checksum=187ffe9180e98e83fbac5bd3644ec6671ba1e8066ca6013a98b4f1d7439cff3a do_check() { cd build diff --git a/srcpkgs/kf6-kservice/template b/srcpkgs/kf6-kservice/template index d50f1fa99bf..88a3b6fc02a 100644 --- a/srcpkgs/kf6-kservice/template +++ b/srcpkgs/kf6-kservice/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kservice' pkgname=kf6-kservice -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kservice" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=ba0d6323efecaf055655bb6d9dd072e7f889d23969ca4fc55565bda8999101f4 +checksum=39d2542e38fb3434c5405c92d5b45e0d5ba650d265309adf93c787a741d57fa1 do_check() { cd build diff --git a/srcpkgs/kf6-kstatusnotifieritem/template b/srcpkgs/kf6-kstatusnotifieritem/template index 32fc9f49fbb..4ab80965124 100644 --- a/srcpkgs/kf6-kstatusnotifieritem/template +++ b/srcpkgs/kf6-kstatusnotifieritem/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kstatusnotifieritem' pkgname=kf6-kstatusnotifieritem -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kstatusnotifieritem" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=f2522bd1de0b02160f78aae0150c48a9ed299186884fb99d0a6fb80549e409dd +checksum=80eae2693cdb5da669b4ed6a8228bddc39816aca0fde928f231e4894827d1de0 kf6-kstatusnotifieritem-devel_package() { depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-ksvg/template b/srcpkgs/kf6-ksvg/template index fa88272f73b..0ef86fa39c9 100644 --- a/srcpkgs/kf6-ksvg/template +++ b/srcpkgs/kf6-ksvg/template @@ -1,6 +1,6 @@ # Template file for 'kf6-ksvg' pkgname=kf6-ksvg -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ksvg" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=fd574866b6879809ecfd24f9d92c7ce51aadb91527e51d1f7c67dec8647d8ac6 +checksum=bbdf7c786c959707cd9c67c04a67e51a15dbcdd6eff7ab52b03c09544e66f184 kf6-ksvg-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-ktexteditor/template b/srcpkgs/kf6-ktexteditor/template index 7f88bf03e31..e166656bbb7 100644 --- a/srcpkgs/kf6-ktexteditor/template +++ b/srcpkgs/kf6-ktexteditor/template @@ -1,6 +1,6 @@ # Template file for 'kf6-ktexteditor' pkgname=kf6-ktexteditor -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake @@ -19,7 +19,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ktexteditor" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=9991a78fd5cf692964d84210baea472ece56434d924f9e67561b857f8b48c777 +checksum=ed76f72324225a926e00c2c970d48d7f11a576e942e48d092e9837bda79d6991 kf6-ktexteditor-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-ktexttemplate/template b/srcpkgs/kf6-ktexttemplate/template index 7c145c5b1aa..cf3fdc8d8a1 100644 --- a/srcpkgs/kf6-ktexttemplate/template +++ b/srcpkgs/kf6-ktexttemplate/template @@ -1,6 +1,6 @@ # Template file for 'kf6-ktexttemplate' pkgname=kf6-ktexttemplate -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ktexttemplate" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=23611a7724d9ccb534cba22dc88885748cf2ec9037d3dccad5cc54a3d4bdb954 +checksum=d6b75f193f4d8d817cf374872a57427489c61736121c72a69c4dd7ee62e1e233 kf6-ktexttemplate-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-ktextwidgets/template b/srcpkgs/kf6-ktextwidgets/template index 3ae167f8f83..c9ace04cb9f 100644 --- a/srcpkgs/kf6-ktextwidgets/template +++ b/srcpkgs/kf6-ktextwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kf6-ktextwidgets' pkgname=kf6-ktextwidgets -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ktextwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=805dff320b75a62316fe50aa33eedb355c1e2db36d00b58c39fc36ce6bfd8988 +checksum=23bb71450e39f437c06bd9af48e7893253c31ad10649b0901d0a8ec1ee18ae01 kf6-ktextwidgets-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kunitconversion/template b/srcpkgs/kf6-kunitconversion/template index 6444538742b..6428df08f19 100644 --- a/srcpkgs/kf6-kunitconversion/template +++ b/srcpkgs/kf6-kunitconversion/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kunitconversion' pkgname=kf6-kunitconversion -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kunitconversion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=a874f093a3e64f08d1d37e1142e17d78a112b613ece5cfa1f747dd1d26789f91 +checksum=b303601c623cd66edb66a66fd72e957415b8dd33e70305be8136fa6b43b1a40a kf6-kunitconversion-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kuserfeedback/template b/srcpkgs/kf6-kuserfeedback/template index be021e83066..634485001ec 100644 --- a/srcpkgs/kf6-kuserfeedback/template +++ b/srcpkgs/kf6-kuserfeedback/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kuserfeedback' pkgname=kf6-kuserfeedback -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kuserfeedback" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=3bb42251679edd643ccdccbc9babcae790b9d51b9dfaef6ded9b4ac34ad2df55 +checksum=4def8d0d6ef227807b6066cb762cec352452a18e0e28b56aecce8ef3ceb52761 do_check() { cd build diff --git a/srcpkgs/kf6-kwallet/template b/srcpkgs/kf6-kwallet/template index 010bad18ca6..0ca35eac58e 100644 --- a/srcpkgs/kf6-kwallet/template +++ b/srcpkgs/kf6-kwallet/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kwallet' pkgname=kf6-kwallet -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwallet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=b319cc4cf79cc1796e7246f61bbc56bba070aa5ec994b30e11b1faa685ce7d54 +checksum=ffb319ce0dfeea95389e1a2f4833d1099b894c81f1df7ab50dcfb796ea87ffa2 kf6-kwallet-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-kwidgetsaddons/template b/srcpkgs/kf6-kwidgetsaddons/template index 94f2c068024..96c164bbff8 100644 --- a/srcpkgs/kf6-kwidgetsaddons/template +++ b/srcpkgs/kf6-kwidgetsaddons/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kwidgetsaddons' pkgname=kf6-kwidgetsaddons -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="$(vopt_bool designerplugin BUILD_DESIGNERPLUGIN)" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwidgetsaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=137cc549d62f9bc9a147d8281d616f4415fc5ac3541d48e66c5cb798e7111fc3 +checksum=bd36342893863e6110c5f1245f8ae0b3a338275f4eaf124b15585d2fe492329a build_options="designerplugin" diff --git a/srcpkgs/kf6-kwindowsystem/template b/srcpkgs/kf6-kwindowsystem/template index 49f5efaabc9..20eb5256655 100644 --- a/srcpkgs/kf6-kwindowsystem/template +++ b/srcpkgs/kf6-kwindowsystem/template @@ -1,7 +1,7 @@ # Template file for 'kf6-kwindowsystem' pkgname=kf6-kwindowsystem -version=6.6.0 -revision=2 +version=6.7.0 +revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwindowsystem" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=2c771ebf1a297774305dfcf79423db0684da0662eacb99e5740b00f3ffe332e5 +checksum=62c0f0b4a9507939d84aeeda55bbd4300b88c04e37953e5189b139003310a8f4 post_install() { sed -i -e 's:/usr/[a-z0-9-]*/usr/include;::' \ diff --git a/srcpkgs/kf6-kxmlgui/template b/srcpkgs/kf6-kxmlgui/template index acb24d30102..0c7ab3de3c0 100644 --- a/srcpkgs/kf6-kxmlgui/template +++ b/srcpkgs/kf6-kxmlgui/template @@ -1,6 +1,6 @@ # Template file for 'kf6-kxmlgui' pkgname=kf6-kxmlgui -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kxmlgui" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=647fc7510d33b9de9196fd2c8f6f6a114dd18559ee21aab7cf47f687b8ae0452 +checksum=a451c16d70a591de13973079115f35905e3c42302f5c8c8ae3ec75d76a06fca1 do_check() { cd build diff --git a/srcpkgs/kf6-modemmanager-qt/template b/srcpkgs/kf6-modemmanager-qt/template index 6511ac1a45d..610c718bec3 100644 --- a/srcpkgs/kf6-modemmanager-qt/template +++ b/srcpkgs/kf6-modemmanager-qt/template @@ -1,6 +1,6 @@ # Template file for 'kf6-modemmanager-qt' pkgname=kf6-modemmanager-qt -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/modemmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=e8cff8728c83e3638aa85d2f837ca75e1c50325632f4b64e5e4185d0cd6b071b +checksum=fc45dcd8ada243baf7900099062f312b677bf694f88f36746d534afe907bf8f3 do_check() { cd build diff --git a/srcpkgs/kf6-networkmanager-qt/template b/srcpkgs/kf6-networkmanager-qt/template index 71548393e86..ce0c5797872 100644 --- a/srcpkgs/kf6-networkmanager-qt/template +++ b/srcpkgs/kf6-networkmanager-qt/template @@ -1,6 +1,6 @@ # Template file for 'kf6-networkmanager-qt' pkgname=kf6-networkmanager-qt -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/networkmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=06392d71e6e09758cb1b433d3b1dc667cb59dd7a96b3510f232b5cadff332e40 +checksum=563231644587918c950bcbe5fda0bf6a35e97a12f6b0e9bf9eaa4ce3141d3122 do_check() { cd build diff --git a/srcpkgs/kf6-prison/template b/srcpkgs/kf6-prison/template index 1bc1f690293..c866e935ad5 100644 --- a/srcpkgs/kf6-prison/template +++ b/srcpkgs/kf6-prison/template @@ -1,6 +1,6 @@ # Template file for 'kf6-prison' pkgname=kf6-prison -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/prison" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=d8baf33252cf2bb431f8048c459a0a0c4b72ce6a7c2f5e7325ad2df7ca74ba5c +checksum=0a053a80beae232cef5da3f6525b14ee649b275cea64de0c0ffad41c3f2ec260 kf6-prison-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-purpose/template b/srcpkgs/kf6-purpose/template index c29a13cad6f..8acd040b035 100644 --- a/srcpkgs/kf6-purpose/template +++ b/srcpkgs/kf6-purpose/template @@ -1,6 +1,6 @@ # Template file for 'kf6-purpose' pkgname=kf6-purpose -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/purpose" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=d02c70c3d122eda4739e8716f05c9bb7370751d06730d8e23d1cf4266d00c2d2 +checksum=4f8bbf19022c70df1dc345a4abd81677a505a2e8fef643311287fe8e9212d56a kf6-purpose-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-qqc2-desktop-style/template b/srcpkgs/kf6-qqc2-desktop-style/template index 074a2159488..c818c3a07f3 100644 --- a/srcpkgs/kf6-qqc2-desktop-style/template +++ b/srcpkgs/kf6-qqc2-desktop-style/template @@ -1,6 +1,6 @@ # Template file for 'kf6-qqc2-desktop-style' pkgname=kf6-qqc2-desktop-style -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/qqc2-desktop-style" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=a82361a7b206b94a784ee9b919276ef733fb694710a1505af9a71db70832eb62 +checksum=b6602d21ba891a63461827aa4513946aef0d8e0141f4a831aafb2c4d2e3fb329 do_check() { cd build diff --git a/srcpkgs/kf6-solid/template b/srcpkgs/kf6-solid/template index e03414637b1..0f72bcd337e 100644 --- a/srcpkgs/kf6-solid/template +++ b/srcpkgs/kf6-solid/template @@ -1,6 +1,6 @@ # Template file for 'kf6-solid' pkgname=kf6-solid -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base flex" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/solid" #changelog="" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=88f67f369c720aaa0d347ee09273684335505c4f8faf5f7684d1acb7229455f1 +checksum=3673f17776c30d9523fe40b8f38e62be1037610050f782c136da1ac04b20e6e7 kf6-solid-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-sonnet/template b/srcpkgs/kf6-sonnet/template index fd8978ae996..bdf6d490fa3 100644 --- a/srcpkgs/kf6-sonnet/template +++ b/srcpkgs/kf6-sonnet/template @@ -1,6 +1,6 @@ # Template file for 'kf6-sonnet' pkgname=kf6-sonnet -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args="$(vopt_bool designerplugin BUILD_DESIGNERPLUGIN) @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/sonnet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=2f8a5ef2d5264a31af686efa8fe31372837edc5317f3103395dd389c37237316 +checksum=2f970d490effd668e64dd93ffef344a80db7e63130bb23df4fa0d6b14150e588 build_options="designerplugin" diff --git a/srcpkgs/kf6-syndication/template b/srcpkgs/kf6-syndication/template index 08d8e3a1ec7..62d2a37f774 100644 --- a/srcpkgs/kf6-syndication/template +++ b/srcpkgs/kf6-syndication/template @@ -1,6 +1,6 @@ # Template file for 'kf6-syndication' pkgname=kf6-syndication -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/syndication" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=627e4b310b8721e8b426ec5492f4036a7756d98933d318738352bfdd0a78a0d0 +checksum=c2a485229d8a430858d7f473fe8b133737d93d33a776e46eedfa77bb9e30ba24 kf6-syndication-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kf6-syntax-highlighting/template b/srcpkgs/kf6-syntax-highlighting/template index 36aa7dcb1d1..4444602de36 100644 --- a/srcpkgs/kf6-syntax-highlighting/template +++ b/srcpkgs/kf6-syntax-highlighting/template @@ -1,6 +1,6 @@ # Template file for 'kf6-syntax-highlighting' pkgname=kf6-syntax-highlighting -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake configure_args=" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/syntax-highlighting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=bf946d2606ef293949a51a7446f150954e2f78193ff5461b4abd198939b9f1b6 +checksum=6ef527a941740b9ddfe053eb08ead7e11c12a283aa88a5ddf1a18520cd9d2ca7 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kf6-syntax-highlighting-devel" diff --git a/srcpkgs/kf6-threadweaver/template b/srcpkgs/kf6-threadweaver/template index 9b497741982..28594c46d7d 100644 --- a/srcpkgs/kf6-threadweaver/template +++ b/srcpkgs/kf6-threadweaver/template @@ -1,6 +1,6 @@ # Template file for 'kf6-threadweaver' pkgname=kf6-threadweaver -version=6.6.0 +version=6.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base " @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/threadweaver" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" -checksum=19555488abf05a9d5a1641f165a67d347e23ab7d14c6f9464ffcf8db2370317a +checksum=1ac3fc8051f31ac4f76dfd5d157e5c375d183bc0762152a44e1831cf5816a956 kf6-threadweaver-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template index 955db2b2167..5608dee43d9 100644 --- a/srcpkgs/kid3/template +++ b/srcpkgs/kid3/template @@ -1,7 +1,7 @@ # Template file for 'kid3' pkgname=kid3 -version=3.9.5 -revision=3 +version=3.9.6 +revision=1 build_style=cmake configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)' -DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF) @@ -21,7 +21,7 @@ license="GPL-2.0-only" homepage="https://kid3.kde.org" changelog="https://invent.kde.org/multimedia/kid3/-/raw/master/ChangeLog" distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz" -checksum=d68f6e1d7b794b991b57bf976edb8e22d3457911db654ad1fb9b124cc62057f9 +checksum=df4a330b874cace7e84beb6d178316f681d09abb94d368c056de7e749ce4dff8 build_options="KDE mp3 mp4 flac vorbis taglib chromaprint" build_options_default="mp3 mp4 flac vorbis taglib chromaprint" diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index 0e265d2d98d..0879165dcf2 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,6 +1,6 @@ # Template file for 'kitty' pkgname=kitty -version=0.36.4 +version=0.37.0 revision=1 build_helper="python3" pycompile_dirs="usr/lib/kitty" @@ -17,7 +17,7 @@ license="GPL-3.0-only" homepage="https://sw.kovidgoyal.net/kitty/" changelog="https://sw.kovidgoyal.net/kitty/changelog.html" distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz" -checksum=10ebf00a8576bca34ae683866c5be307a35f3c517906d6441923fd740db059bd +checksum=efbf933dfe930abd7c88ad0860997633c9c23b46c5000c5872ae3859dfbc50ff python_version=3 nopie_files="/usr/bin/kitten" diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template index c177822c3db..884548d4352 100644 --- a/srcpkgs/knot/template +++ b/srcpkgs/knot/template @@ -1,6 +1,6 @@ # Template file for 'knot' pkgname=knot -version=3.4.1 +version=3.4.2 revision=1 build_style=gnu-configure configure_args=" @@ -21,7 +21,7 @@ license="GPL-3.0-or-later" homepage="https://www.knot-dns.cz/" changelog="https://gitlab.nic.cz/knot/knot-dns/-/raw/${version%*.*}/NEWS" distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz" -checksum=252a2b83a9319a605103f7491d73a881e97c63339d09170ac9d525155fa41b1a +checksum=d835285c1057d45effa1479cfe1f107a50e83d11c1c6d36f270deda88799883e system_accounts="_knot" _knot_homedir="/var/lib/knot" diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template index e4ddc0c212b..4f8360f3e44 100644 --- a/srcpkgs/kodi-addon-inputstream-rtmp/template +++ b/srcpkgs/kodi-addon-inputstream-rtmp/template @@ -1,8 +1,8 @@ # Template file for 'kodi-addon-inputstream-rtmp' pkgname=kodi-addon-inputstream-rtmp -version=3.4.0 -revision=2 -_kodi_release=Matrix +version=21.1.0 +revision=1 +_kodi_release=Omega build_style=cmake hostmakedepends="pkg-config" makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel @@ -12,7 +12,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/xbmc/inputstream.rtmp" distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz" -checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212 +checksum=193fabb14cd9d92baecf7319c50ba183bc6254385bf187fe2a726159134df2a9 if [ -n "${CROSS_BUILD}" ]; then configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake" diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template index ccc1bfbbcf9..9d391e5a22c 100644 --- a/srcpkgs/kodi-addon-pvr-hts/template +++ b/srcpkgs/kodi-addon-pvr-hts/template @@ -1,8 +1,8 @@ # Template file for 'kodi-addon-pvr-hts' pkgname=kodi-addon-pvr-hts -version=19.0.6 +version=21.2.5 revision=1 -_kodi_release=Matrix +_kodi_release=Omega build_style=cmake makedepends="kodi-devel kodi-platform-devel p8-platform-devel" short_desc="Tvheadend HTSP client addon for Kodi" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/kodi-pvr/pvr.hts" distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz" -checksum=990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb +checksum=c54c249a4c91091e47245b406210224aa4e3c5468497eb9cdeb09cd336cab4b2 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template index 9d9088b785a..e8f47ef73bb 100644 --- a/srcpkgs/kodi-addon-pvr-iptvsimple/template +++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template @@ -1,8 +1,8 @@ # Template file for 'kodi-addon-pvr-iptvsimple' pkgname=kodi-addon-pvr-iptvsimple -version=19.1.0 +version=21.8.7 revision=1 -_kodi_release=Matrix +_kodi_release=Omega build_style=cmake hostmakedepends="pkg-config" makedepends="kodi-devel kodi-platform-devel p8-platform-devel pugixml-devel @@ -12,7 +12,7 @@ maintainer="Alexander Egorenkov " license="GPL-2.0-or-later" homepage="https://github.com/kodi-pvr/pvr.iptvsimple" distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz" -checksum=c92736b3f3c96fe36d7b20b329c82b47180260e3ed40fc456ef709572fad5fb0 +checksum=fb526d408b5a707c169399aa41e6a111045c4c78d28b4971f4e51ccf02930b4a if [ -n "${CROSS_BUILD}" ]; then configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake" diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index cedb7ee439c..bc465fadf1d 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita -version=5.2.3 -revision=2 +version=5.2.6 +revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF -DENABLE_UPDATERS=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 @@ -17,13 +17,13 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel libjxl-devel libkdcraw5-devel immer zug lager libunibreak-devel mlt7-devel xsimd" -depends="qt5-plugin-sqlite" +depends="qt5-plugin-sqlite python3-PyQt5" short_desc="Painting and image editing program" maintainer="John " license="GPL-3.0-only" homepage="https://krita.org/" distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.xz" -checksum=cf78ddb39700c92928cf14d7611b8ef3870d8f5b83ef590d43e218bec5dafd54 +checksum=7a9be2c782a87b349e2267bda74ecc43381a085b639b5b2b91da1c56f977de59 python_version=3 replaces="calligra-krita>=0" # FIXME diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template index c8dd2878cf4..4dd4bc5ffde 100644 --- a/srcpkgs/ktouch/template +++ b/srcpkgs/ktouch/template @@ -1,6 +1,6 @@ # Template file for 'ktouch' pkgname=ktouch -version=24.08.1 +version=24.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools @@ -16,4 +16,4 @@ license="GPL-2.0-or-later" homepage="https://apps.kde.org/ktouch" changelog="https://kde.org/announcements/changelogs/gear/${version}/#ktouch" distfiles="${KDE_SITE}/release-service/${version}/src/ktouch-${version}.tar.xz" -checksum=8f1df54fb93e8b6f88c869a3bdfbb159960011315925cb2750574dfdddddb20d +checksum=bc7eb7c0f4001fc508ae290550201e5816684b1e8923e4a8f0570791ba1585b0 diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template index b34e80104b7..612fcf8a9b6 100644 --- a/srcpkgs/kubernetes-helm/template +++ b/srcpkgs/kubernetes-helm/template @@ -1,20 +1,21 @@ # Template file for 'kubernetes-helm' pkgname=kubernetes-helm -version=3.15.4 +version=3.16.3 revision=1 build_style=go build_helper=qemu go_import_path="helm.sh/helm/v3" go_package="./cmd/helm" go_mod_mode=off -go_ldflags="-X helm.sh/helm/v3/internal/version.version=v${version}" +go_ldflags="-X helm.sh/helm/v3/internal/version.version=v${version%.*}" +checkdepends="git" short_desc="Kubernetes Package Manager" maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://helm.sh/" changelog="https://github.com/helm/helm/releases" distfiles="https://github.com/helm/helm/archive/refs/tags/v${version}.tar.gz" -checksum=71eb0f4b2bf6e7de6a78191ba053b04842c294c830e57648ab2352bcfe1b4566 +checksum=d476949802e2293620a4947f1fdd9006b88e4120fe6d0fafaef14b79badb72ee conflicts="helm" nopie=yes diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index e8a3ab1b9de..e317a15c828 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.31.1 +version=1.31.2 revision=1 archs="aarch64* x86_64* ppc64le*" build_style=go @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://kubernetes.io" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=83094915698a9c24f93d1ffda3f17804a4024d3b65eabf681e77a62b35137208 +checksum=05007001f41176b388fcb01d6dc35e454db35a4e65b114db42b2b7340be8aed3 nocross=yes system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" diff --git a/srcpkgs/labwc/template b/srcpkgs/labwc/template index 83a987fe00d..b17ebab0cca 100644 --- a/srcpkgs/labwc/template +++ b/srcpkgs/labwc/template @@ -1,10 +1,10 @@ # Template file for 'labwc' pkgname=labwc -version=0.8.0 +version=0.8.1 revision=1 build_style=meson hostmakedepends="pkg-config scdoc wayland-devel" -makedepends="cairo-devel glib-devel libpng-devel librsvg-devel libxml2-devel +makedepends="cairo-devel glib-devel libpng-devel librsvg-devel libsfdo-devel libxml2-devel pango-devel wlroots0.18-devel" depends="xorg-server-xwayland" short_desc="Wayland window-stacking compositor" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://labwc.github.io/" changelog="https://raw.githubusercontent.com/labwc/labwc/master/NEWS.md" distfiles="https://github.com/labwc/labwc/archive/refs/tags/${version}.tar.gz" -checksum=1bfe5791c6002c1355821046623fa64231afd42e4d2ec1f6a9af44ef3b24f780 +checksum=8e510655cf0c84875c541f4afeb636e707d365210993ad22d64d8bc3108a3433 diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index cb6cfd2785d..b9f79a4c54e 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.18.0 +version=1.18.3 revision=1 build_style=cmake configure_args="-DTFDN_ENABLE_SSE41=NO" @@ -13,7 +13,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=d23a89bfcdbd654f2b54c2406e359d7687595bc1b5dbbd13882e02397d546345 +checksum=c432e2f4dd35a6cee0f4d5a77974708ec6fed76bc13cc630bb50650acec87e62 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template index 211715cdd78..add7eb6e05c 100644 --- a/srcpkgs/lc0/template +++ b/srcpkgs/lc0/template @@ -1,6 +1,6 @@ # Template file for 'lc0' pkgname=lc0 -version=0.31.1 +version=0.31.2 revision=1 archs="x86_64* i686* aarch64* armv[67]l* ppc64le*" create_wrksrc=yes @@ -16,7 +16,7 @@ license="GPL-3.0-only" homepage="https://lczero.org" distfiles="https://github.com/LeelaChessZero/lc0/archive/v${version}.tar.gz https://github.com/LeelaChessZero/lczero-common/archive/${_lczero_commit}.tar.gz" -checksum="0bc3d3b2171230c36a729092f20d7d51177e88650c87a7c3431b00b908501d04 +checksum="6dea1e67e33ec0513853df4fef24d51318e47a6cf0f35c0491cce5c1547dc023 96d82279d1c65ba41ed136977cdbb5c2fab2a30212982f65ab679b425056e9e7" build_options="openblas opencl" diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template index f82e08182fa..ca0cab3d1be 100644 --- a/srcpkgs/lf/template +++ b/srcpkgs/lf/template @@ -1,7 +1,7 @@ # Template file for 'lf' pkgname=lf -version=r32 -revision=2 +version=r33 +revision=1 build_style=go go_import_path="github.com/gokcehan/${pkgname}" go_ldflags="-X main.gVersion=$version" @@ -10,7 +10,7 @@ maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/gokcehan/lf" distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz" -checksum=01531e7a78d8bfbe14739072e93446d003f0e4ce12032a26671fa326b73bc911 +checksum=045565197a9c12a14514b85c153dae4ee1bcd3b4313d60aec5004239d8d785a0 post_install() { vlicense LICENSE @@ -26,5 +26,4 @@ post_install() { vsconf etc/lfcd.fish vsconf etc/lfcd.csh vsconf etc/lfcd.nu - } diff --git a/srcpkgs/lib2geom/template b/srcpkgs/lib2geom/template index f1824a11715..20782b4310e 100644 --- a/srcpkgs/lib2geom/template +++ b/srcpkgs/lib2geom/template @@ -1,7 +1,7 @@ # Template file for 'lib2geom' pkgname=lib2geom -version=1.3 -revision=2 +version=1.4 +revision=1 build_style=cmake configure_args="-D2GEOM_BUILD_SHARED=ON" hostmakedepends="pkg-config python3-Cython ragel samurai" @@ -12,7 +12,7 @@ maintainer="Hervy Qurrotul Ainur Rozi " license="LGPL-2.1-or-later, MPL-1.1" homepage="https://gitlab.com/inkscape/lib2geom" distfiles="https://gitlab.com/inkscape/lib2geom/-/archive/${version}/lib2geom-${version}.tar.bz2" -checksum=bd07f2a1322fcad16a55a1901207faa55dffdecebc56a00eabd4575f62e043c9 +checksum=717a87ce7f2192271a789c1273ae7b432856c522647b9fe33bb4dd662942b3ea if [ -n "$XBPS_CHECK_PKGS" ]; then configure_args+=" -D2GEOM_TESTING=ON" @@ -22,8 +22,8 @@ fi do_check() { case "$XBPS_TARGET_MACHINE" in - x86_64-musl) _fail='circle-test' ;; - i686) _fail='(angle|bezier|ellipse|elliptical-arc|self-intersections)-test' ;; + x86_64-musl) _fail='(circle|line)-test' ;; + i686) _fail='(angle|bezier|ellipse|elliptical-arc|self-intersections|line|polynomial)-test' ;; esac ctest --test-dir build --output-on-failure "$makejobs" -E "$_fail" } diff --git a/srcpkgs/libabigail/template b/srcpkgs/libabigail/template index c26375d7a33..5c4f728a69b 100644 --- a/srcpkgs/libabigail/template +++ b/srcpkgs/libabigail/template @@ -1,16 +1,17 @@ # Template file for 'libabigail' pkgname=libabigail -version=2.5 +version=2.6 revision=1 build_style=gnu-configure hostmakedepends="automake cpio dpkg libtool pkg-config python3-Sphinx texinfo" -makedepends="elfutils-devel libxml2-devel" +makedepends="binutils-devel elfutils-devel libbpf-devel libxml2-devel + xxHash-devel" short_desc="ABI Generic Analysis and Instrumentation Library" maintainer="Leah Neukirchen " license="LGPL-3.0-or-later" homepage="https://www.sourceware.org/libabigail/" distfiles="http://mirrors.kernel.org/sourceware/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=7cfc4e9b00ae38d87fb0c63beabb32b9cbf9ce410e52ceeb5ad5b3c5beb111f3 +checksum=3bfa8ba753ff27722baa7f73b15a475f8a4599355e47439108423d1912bb5469 case "$XBPS_TARGET_MACHINE" in *-musl) diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template index 0bb7137bf7b..dd66091b25d 100644 --- a/srcpkgs/libadwaita/template +++ b/srcpkgs/libadwaita/template @@ -1,6 +1,6 @@ # Template file for 'libadwaita' pkgname=libadwaita -version=1.6.0 +version=1.6.1 revision=1 build_style=meson build_helper="gir" @@ -16,7 +16,7 @@ license="LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libadwaita/" changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-6/NEWS" distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz" -checksum=9ed783934cb99c9101639194e1fc072cb09303b8f3c2fc6623390186a9dad8d3 +checksum=d00ac845a4545d92e6805e31095a51c68f9f4e02426900472084b0cddce3f833 make_check_pre="dbus-run-session xvfb-run" build_options="gir gtk_doc" diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 09ce9a7674f..b3b133cc452 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,6 +1,6 @@ # Template file for 'libarchive' pkgname=libarchive -version=3.7.6 +version=3.7.7 revision=1 bootstrap=yes build_style=gnu-configure @@ -18,7 +18,7 @@ license="BSD-2-Clause" homepage="https://www.libarchive.org/" changelog="https://github.com/libarchive/libarchive/releases" distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.xz" -checksum=0a2efdcb185da2eb1e7cd8421434cb9a6119f72417a13335cca378d476fd3ba0 +checksum=879acd83c3399c7caaee73fe5f7418e06087ab2aaf40af3e99b9e29beb29faee build_options="acl expat lzo lz4 ssl zstd" build_options_default="acl ssl lz4 zstd" diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template index 50fb0778cad..29f9c555bd0 100644 --- a/srcpkgs/libblockdev/template +++ b/srcpkgs/libblockdev/template @@ -1,7 +1,7 @@ # Template file for 'libblockdev' pkgname=libblockdev version=3.1.1 -revision=1 +revision=2 build_style=gnu-configure make_check_target="test" hostmakedepends="pkg-config python3-setuptools" diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template index 67daa76912e..c8404bef25a 100644 --- a/srcpkgs/libbpf/template +++ b/srcpkgs/libbpf/template @@ -1,6 +1,6 @@ # Template file for 'libbpf' pkgname=libbpf -version=1.4.6 +version=1.5.0 revision=1 build_wrksrc="src" build_style=gnu-makefile @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="LGPL-2.1-only, BSD-2-Clause" homepage="https://github.com/libbpf/libbpf" distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz" -checksum=d4cf3ee697d9bd959ad3c0f5c6757370a2559e54448761271e15a23c31c1082e +checksum=53492aff6dd47e4da04ef5e672d753b9743848bdb38e9d90eafbe190b7983c44 post_install() { vlicense ../LICENSE diff --git a/srcpkgs/libbraiding/template b/srcpkgs/libbraiding/template index af8337e6ddb..39d3a991f59 100644 --- a/srcpkgs/libbraiding/template +++ b/srcpkgs/libbraiding/template @@ -1,6 +1,6 @@ # Template file for 'libbraiding' pkgname=libbraiding -version=1.2 +version=1.3 revision=1 build_style=gnu-configure short_desc="Library to compute several properties of braids" @@ -9,7 +9,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/miguelmarco/libbraiding/" changelog="https://github.com/miguelmarco/libbraiding/releases" distfiles="https://github.com/miguelmarco/libbraiding/releases/download/$version/libbraiding-$version.tar.gz" -checksum=73087d1145ace719eafeda1db1c28b5fe1c981b7e784dc59f2b1d6fc4ff75f80 +checksum=428e8b22a42e5539e511619ac61242e088642054bacae1daef174667ecf19000 libbraiding-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index 0ff935755d6..468dcfd67a2 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -1,6 +1,6 @@ # Template file for 'libcap' pkgname=libcap -version=2.70 +version=2.71 revision=1 bootstrap=yes build_style=gnu-makefile @@ -13,7 +13,7 @@ license="GPL-2.0-only, BSD-3-Clause" homepage="https://sites.google.com/site/fullycapable/" changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap" distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz" -checksum=23a6ef8aadaf1e3e875f633bb2d116cfef8952dba7bc7c569b13458e1952b30f +checksum=b7006c9af5168315f35fc734bf1a8d2aa70766bd8b8c4340962e05b19c35b900 if [ "$CROSS_BUILD" ]; then make_build_args+=" CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" diff --git a/srcpkgs/libclang-cpp19 b/srcpkgs/libclang-cpp19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/libclang-cpp19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/libclang19 b/srcpkgs/libclang19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/libclang19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template index da85a23c785..63d5a06fa2b 100644 --- a/srcpkgs/libclc/template +++ b/srcpkgs/libclc/template @@ -1,10 +1,10 @@ # Template file for 'libclc' pkgname=libclc version=18.1.8 -revision=1 +revision=3 build_style=cmake # disable clspv (failing tests, we don't ship it) -configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release +configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm/18/ -DCMAKE_BUILD_TYPE=Release -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-" hostmakedepends="llvm18-devel python3 libedit-devel libffi-devel ncurses-devel zlib-devel SPIRV-LLVM-Translator" @@ -16,6 +16,12 @@ distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${vers checksum=905bd59e9f810d6bd0ae6874725a8f8a3c91cb416199c03f2b98b57437cfb32e replaces="libclc-git>=0" +alternatives=" + libclc:/usr/share/clc:/usr/lib/llvm/18/share/clc + libclc:/usr/include/clc:/usr/lib/llvm/18/include/clc + libclc:/usr/share/pkgconfig/libclc.pc:/usr/lib/llvm/18/share/pkgconfig/libclc.pc +" + do_configure() { # We really do a native build. # The outcome is just header files. diff --git a/srcpkgs/libclc19 b/srcpkgs/libclc19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/libclc19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template index 6257293e664..442d1b0df69 100644 --- a/srcpkgs/libcpuid/template +++ b/srcpkgs/libcpuid/template @@ -1,6 +1,6 @@ # Template file for 'libcpuid' pkgname=libcpuid -version=0.6.2 +version=0.7.0 revision=1 archs="i686* x86_64*" build_style=cmake @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://github.com/anrieff/libcpuid" changelog="https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog" distfiles="https://github.com/anrieff/libcpuid/archive/v${version}.tar.gz" -checksum=3e7f2fc243a6a68d6c909b701cfa0db6422ec33fccf91ea5ab7beda3eb798672 +checksum=cfd9e6bcda5da3f602273e55f983bdd747cb93dde0b9ec06560e074939314210 post_install() { vlicense COPYING diff --git a/srcpkgs/libcupsfilters/template b/srcpkgs/libcupsfilters/template index 34e3839fae6..9d9eb402637 100644 --- a/srcpkgs/libcupsfilters/template +++ b/srcpkgs/libcupsfilters/template @@ -1,7 +1,7 @@ # Template file for 'libcupsfilters' pkgname=libcupsfilters -version=2.0.0 -revision=2 +version=2.1.0 +revision=1 build_style=gnu-configure configure_args="--disable-mutool --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf" @@ -17,7 +17,7 @@ license="Apache-2.0, custom:GPL-2.0-LGPL-2.0-Exception" homepage="https://github.com/OpenPrinting/libcupsfilters" changelog="https://raw.githubusercontent.com/OpenPrinting/libcupsfilters/master/CHANGES.md" distfiles="https://github.com/OpenPrinting/libcupsfilters/releases/download/${version}/libcupsfilters-${version}.tar.xz" -checksum=542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601 +checksum=cbe900c7783e4aab0b1681629fad7322d82d082a51e8bae7e1c741d26bdcd294 post_install() { vlicense COPYING diff --git a/srcpkgs/libcxx b/srcpkgs/libcxx index 1f418dc969a..985027fe0a5 120000 --- a/srcpkgs/libcxx +++ b/srcpkgs/libcxx @@ -1 +1 @@ -llvm18 \ No newline at end of file +llvm19 \ No newline at end of file diff --git a/srcpkgs/libcxx-devel b/srcpkgs/libcxx-devel index 1f418dc969a..985027fe0a5 120000 --- a/srcpkgs/libcxx-devel +++ b/srcpkgs/libcxx-devel @@ -1 +1 @@ -llvm18 \ No newline at end of file +llvm19 \ No newline at end of file diff --git a/srcpkgs/libcxxabi b/srcpkgs/libcxxabi index 1f418dc969a..985027fe0a5 120000 --- a/srcpkgs/libcxxabi +++ b/srcpkgs/libcxxabi @@ -1 +1 @@ -llvm18 \ No newline at end of file +llvm19 \ No newline at end of file diff --git a/srcpkgs/libcxxabi-devel b/srcpkgs/libcxxabi-devel index 1f418dc969a..985027fe0a5 120000 --- a/srcpkgs/libcxxabi-devel +++ b/srcpkgs/libcxxabi-devel @@ -1 +1 @@ -llvm18 \ No newline at end of file +llvm19 \ No newline at end of file diff --git a/srcpkgs/libdbusmenu-lxqt/template b/srcpkgs/libdbusmenu-lxqt/template index 84d520d1cc9..f52f7847d1d 100644 --- a/srcpkgs/libdbusmenu-lxqt/template +++ b/srcpkgs/libdbusmenu-lxqt/template @@ -1,6 +1,6 @@ # Template file for 'libdbusmenu-lxqt' pkgname=libdbusmenu-lxqt -version=0.1.0 +version=0.2.0 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-base qt6-tools" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="LGPL-2" homepage="https://github.com/lxqt/libdbusmenu-lxqt" distfiles="https://github.com/lxqt/libdbusmenu-lxqt/releases/download/${version}/libdbusmenu-lxqt-${version}.tar.xz" -checksum=a82d77375034b0f27e6e08b5c7ad9c19ee88e8d7bb699ee0423a5a0e781fb291 +checksum=8c22a77c7f69061e5b880cc76ddfc9391b80ee7449485806adecb7123501d84e libdbusmenu-lxqt-devel_package() { depends="${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template index 58d7f33f046..2c2a5035af2 100644 --- a/srcpkgs/libesmtp/template +++ b/srcpkgs/libesmtp/template @@ -8,7 +8,7 @@ makedepends="openssl-devel" short_desc="Manage submission of emails using SMTP protocol" maintainer="Orphaned " license="LGPL-2.1-or-later" -homepage="http://brianstafford.info/libesmtp/" +homepage="https://ftp.osuosl.org/pub/blfs/conglomeration/libesmtp" #distfiles="http://brianstafford.info/libesmtp/libesmtp-${version}.tar.bz2" distfiles="https://ftp.osuosl.org/pub/blfs/conglomeration/libesmtp/libesmtp-${version}.tar.bz2" checksum=d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template index 1c60830e7bc..a8cfe7d9fa7 100644 --- a/srcpkgs/libfm-qt/template +++ b/srcpkgs/libfm-qt/template @@ -1,7 +1,7 @@ # Template file for 'libfm-qt' pkgname=libfm-qt -version=2.0.2 -revision=2 +version=2.1.0 +revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-base qt6-tools perl" makedepends="libexif-devel qt6-base-private-devel @@ -11,7 +11,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/libfm-qt/archive/${version}.tar.gz" -checksum=3e7091b7f0c95c4bdfd9f7487358e373b90089b6f68bddef15533c75bad21a1a +checksum=63d947fc4fc09899a78993a9f727950624c70f361d9f5843622aebc2662905f9 libfm-qt-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libgit2-1.8/template b/srcpkgs/libgit2-1.8/template index 0b4c2066af4..96f11929368 100644 --- a/srcpkgs/libgit2-1.8/template +++ b/srcpkgs/libgit2-1.8/template @@ -1,6 +1,6 @@ # Template file for 'libgit2-1.8' pkgname=libgit2-1.8 -version=1.8.2 +version=1.8.4 revision=1 build_style=cmake configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DBUILD_CLI=OFF -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp" @@ -11,7 +11,7 @@ maintainer="tranzystorekk " license="GPL-2.0-only WITH GCC-exception-2.0" homepage="https://libgit2.org" distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz" -checksum=184699f0d9773f96eeeb5cb245ba2304400f5b74671f313240410f594c566a28 +checksum=49d0fc50ab931816f6bfc1ac68f8d74b760450eebdb5374e803ee36550f26774 if [ -z "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTS=OFF" diff --git a/srcpkgs/libgpiod-devel b/srcpkgs/libgpiod-devel new file mode 120000 index 00000000000..79aeec1f099 --- /dev/null +++ b/srcpkgs/libgpiod-devel @@ -0,0 +1 @@ +libgpiod \ No newline at end of file diff --git a/srcpkgs/libgpiod-python3 b/srcpkgs/libgpiod-python3 new file mode 120000 index 00000000000..79aeec1f099 --- /dev/null +++ b/srcpkgs/libgpiod-python3 @@ -0,0 +1 @@ +libgpiod \ No newline at end of file diff --git a/srcpkgs/libgpiod-tools b/srcpkgs/libgpiod-tools new file mode 120000 index 00000000000..79aeec1f099 --- /dev/null +++ b/srcpkgs/libgpiod-tools @@ -0,0 +1 @@ +libgpiod \ No newline at end of file diff --git a/srcpkgs/libgpiod/template b/srcpkgs/libgpiod/template new file mode 100644 index 00000000000..13bf62ca546 --- /dev/null +++ b/srcpkgs/libgpiod/template @@ -0,0 +1,56 @@ +# Template file for 'libgpiod' +pkgname=libgpiod +version=2.2 +revision=2 +build_style="gnu-configure" +build_helper="python3" +configure_args="--prefix=/usr --enable-tools=yes --enable-bindings-cxx + --enable-bindings-python --enable-gpioset-interactive" +hostmakedepends="doxygen pkg-config python3-build python3-pip" +makedepends="libedit-devel python3-devel" +short_desc="Library for interacting with the linux GPIO character device" +maintainer="Tim Sandquist " +license="Apache-2.0, BSD-3-Clause, CC-BY-SA-4.0, CC0-1.0, GPL-2.0-only, GPL-2.0-or-later, + LGPL-2.1-or-later, custom:Linux-syscall-note" +homepage="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git" +distfiles="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-${version}.tar.gz" +checksum=f89c2176250f1a9563265479eb8ad5f22a63f42db6a1f438effc570f0254d2f5 + +post_build() { + make doc +} + +post_install() { + vlicense LICENSES/BSD-3-Clause.txt + vlicense LICENSES/Linux-syscall-note.txt +} + +libgpiod-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + for f in doc/man/man3/*.3 ; do + vman "$f" + done + vmkdir "usr/share/doc/${sourcepkg}" + vcopy "${wrksrc}/doc/html" "usr/share/doc/${sourcepkg}" + } +} + +libgpiod-python3_package() { + short_desc+=" - python bindings" + pkg_install() { + vmove "usr/lib/python3*" + } +} + +libgpiod-tools_package() { + short_desc+=" - utilities" + pkg_install() { + vmove usr/bin + } +} diff --git a/srcpkgs/libjaylink/template b/srcpkgs/libjaylink/template index 56eae2f1153..77a458e4eb1 100644 --- a/srcpkgs/libjaylink/template +++ b/srcpkgs/libjaylink/template @@ -1,9 +1,9 @@ # Template file for 'libjaylink' pkgname=libjaylink -version=0.3.1 +version=0.4.0 revision=1 -build_style=gnu-configure -hostmakedepends="automake libtool pkg-config" +build_style=meson +hostmakedepends="pkg-config" makedepends="libusb-devel" short_desc="Library to access SEGGER J-Link and compatible devices" maintainer="classabbyamp " @@ -11,10 +11,10 @@ license="GPL-2.0-or-later" homepage="https://gitlab.zapb.de/libjaylink/libjaylink" changelog="https://gitlab.zapb.de/libjaylink/libjaylink/-/raw/master/NEWS" distfiles="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${version}/libjaylink-${version}.tar.gz" -checksum=a2d98c1aa13dcf41c6c681767a43cdefc42b6f71af9362937555051007514cd9 +checksum=5557d623934a4bbc053c11f9a181375d7abeb76af910696d9e3d9b1de3bf6987 -pre_configure() { - ./autogen.sh +post_install() { + vinstall contrib/60-libjaylink.rules 644 usr/lib/udev/rules.d } libjaylink-devel_package() { @@ -23,7 +23,6 @@ libjaylink-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" vmove "usr/lib/*.so" } } diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template index 4d01dbccd4a..f1136f13503 100644 --- a/srcpkgs/libjcat/template +++ b/srcpkgs/libjcat/template @@ -1,6 +1,6 @@ # Template file for 'libjcat' pkgname=libjcat -version=0.1.14 +version=0.2.1 revision=1 build_style=meson build_helper="gir" @@ -12,7 +12,7 @@ maintainer="marmeladema " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/libjcat" distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz" -checksum=e754051419d9955cfa4dcf4503aa86105c45bcbb5e95222a938ba95cc8f0569b +checksum=f623815ac855471277dc9d1b3b5ada1a9aaad6da67659c751dc3dec899dc2658 jcat-tool_package() { short_desc+=" - tools" diff --git a/srcpkgs/liblldb19 b/srcpkgs/liblldb19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/liblldb19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/libllvm19 b/srcpkgs/libllvm19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/libllvm19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template index 151dc838c2e..8b896f7b4f4 100644 --- a/srcpkgs/liblxqt/template +++ b/srcpkgs/liblxqt/template @@ -1,6 +1,6 @@ # Template file for 'liblxqt' pkgname=liblxqt -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools @@ -12,7 +12,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/liblxqt/archive/${version}.tar.gz" -checksum=464090c3e3eba5204c59500b2585c4210b44f9438438864fcceb3d09669611a5 +checksum=549ce9547a70ac1947a59bfc41cd62d71851f2c06964ee6e77d3f6643413d2c0 liblxqt-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libmsitools b/srcpkgs/libmsitools new file mode 120000 index 00000000000..baf6b8d3f07 --- /dev/null +++ b/srcpkgs/libmsitools @@ -0,0 +1 @@ +msitools \ No newline at end of file diff --git a/srcpkgs/libnatpmp/template b/srcpkgs/libnatpmp/template index 385c534809e..3e73cf2789d 100644 --- a/srcpkgs/libnatpmp/template +++ b/srcpkgs/libnatpmp/template @@ -7,9 +7,9 @@ make_use_env=y short_desc="Libraries for client side of NAT-PMP" maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause" -homepage="http://miniupnp.free.fr/libnatpmp.html" -changelog="http://miniupnp.free.fr/files/changelog.php?file=libnatpmp-${version}.tar.gz" -distfiles="http://miniupnp.free.fr/files/libnatpmp-${version}.tar.gz" +homepage="https://miniupnp.tuxfamily.org/libnatpmp.html" +changelog="https://miniupnp.tuxfamily.org/files/changelog.php?file=libnatpmp-${version}.tar.gz" +distfiles="https://miniupnp.tuxfamily.org/files/libnatpmp-${version}.tar.gz" checksum=0684ed2c8406437e7519a1bd20ea83780db871b3a3a5d752311ba3e889dbfc70 post_patch() { diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template index c878d834d4a..c447667fed4 100644 --- a/srcpkgs/libnvme/template +++ b/srcpkgs/libnvme/template @@ -1,6 +1,6 @@ # Template file for 'libnvme' pkgname=libnvme -version=1.9 +version=1.10 revision=1 build_style=meson configure_args="-Ddocs=man" @@ -11,8 +11,9 @@ short_desc="C Library for NVM Express on Linux" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/linux-nvme/libnvme" +changelog="https://github.com/linux-nvme/libnvme/releases" distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz" -checksum=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206 +checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960 libnvme-devel_package() { depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel" diff --git a/srcpkgs/libomp19 b/srcpkgs/libomp19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/libomp19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/libomp19-devel b/srcpkgs/libomp19-devel new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/libomp19-devel @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index 3d39ebf816a..7d3761b7be5 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -1,7 +1,7 @@ # Template file for 'libplacebo' pkgname=libplacebo version=6.338.2 -revision=2 +revision=3 build_style=meson configure_args="-Dshaderc=enabled -Dvulkan=enabled -Ddemos=false $(vopt_feature lcms) $(vopt_feature opengl)" diff --git a/srcpkgs/libppd/template b/srcpkgs/libppd/template index f650a84dc5e..56f08e1d5c4 100644 --- a/srcpkgs/libppd/template +++ b/srcpkgs/libppd/template @@ -1,6 +1,6 @@ # Template file for 'libppd' pkgname=libppd -version=2.0.0 +version=2.1.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config ghostscript poppler mupdf-tools" @@ -11,7 +11,7 @@ license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception" homepage="https://github.com/OpenPrinting/libppd" changelog="https://github.com/OpenPrinting/libppd/blob/master/CHANGES.md" distfiles="https://github.com/OpenPrinting/libppd/releases/download/${version}/libppd-${version}.tar.xz" -checksum=882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8 +checksum=bc4d7f8b749a8809f532459a5dd2f3513556ea2b96b3e12aced3e078c2697cba post_install() { vlicense COPYING diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template index e701df3ddb3..1f38fc2e45e 100644 --- a/srcpkgs/libqalculate/template +++ b/srcpkgs/libqalculate/template @@ -1,7 +1,7 @@ # Template file for 'libqalculate' # NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt' pkgname=libqalculate -version=5.2.0 +version=5.3.0 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config doxygen" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://qalculate.github.io" changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz" -checksum=20be13a39aea7f0371af789539cb285892f2e15d8240f29f9f380984e3446830 +checksum=61dd60b1d43ad3d2944cff9b2f45c9bc646c5a849c621133ef07231e8289e35b qalculate_package() { short_desc="Multi-purpose desktop calculator - CLI version" diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template index ad78258eeb3..09e3f4f4026 100644 --- a/srcpkgs/libqtxdg/template +++ b/srcpkgs/libqtxdg/template @@ -1,6 +1,6 @@ # Template file for 'libqtxdg' pkgname=libqtxdg -version=4.0.1 +version=4.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-base" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz" -checksum=4adb3f1c7ee0d7f1ad53dab8a79a3916a23fb8b902c8fb2f5c02ec8a4be1547b +checksum=23015b9a834ecec6b67a96fb06297d6c7496cbb58b4b70183e101c7a92db7ed3 case "${XBPS_TARGET_MACHINE}" in armv6l*|armv7l*) diff --git a/srcpkgs/libsecp256k1/template b/srcpkgs/libsecp256k1/template index 428975a6205..8b834a9b819 100644 --- a/srcpkgs/libsecp256k1/template +++ b/srcpkgs/libsecp256k1/template @@ -1,6 +1,6 @@ # Template file for 'libsecp256k1' pkgname=libsecp256k1 -version=0.4.1 +version=0.5.1 revision=1 build_style=gnu-configure configure_args="--disable-benchmark --disable-coverage --enable-experimental @@ -12,7 +12,7 @@ maintainer="Arjan Mossel " license="MIT" homepage="https://github.com/bitcoin-core/secp256k1" distfiles="https://github.com/bitcoin-core/secp256k1/archive/v${version}.tar.gz" -checksum="31b1a03c7365dbce7aff4be9526243da966c58a8b88b6255556d51b3016492c5" +checksum="081f4730becba2715a6b0fd198fedd9e649a6caaa6a7d6d3cf0f9fa7483f2cf1" pre_configure() { ./autogen.sh diff --git a/srcpkgs/libshumate/template b/srcpkgs/libshumate/template index c83a7641bf3..14ca73687f1 100644 --- a/srcpkgs/libshumate/template +++ b/srcpkgs/libshumate/template @@ -1,6 +1,6 @@ # Template file for 'libshumate' pkgname=libshumate -version=1.2.2 +version=1.3.0 revision=1 build_style=meson build_helper="gir" @@ -18,7 +18,7 @@ homepage="https://wiki.gnome.org/Projects/libshumate" #changelog="https://gitlab.gnome.org/GNOME/libshumate/-/raw/main/NEWS" changelog="https://gitlab.gnome.org/GNOME/libshumate/-/raw/libshumate-1-2/NEWS" distfiles="${GNOME_SITE}/libshumate/${version%.*}/libshumate-${version}.tar.xz" -checksum=6f587579f7f2d60b38d3f4727eb1a8d2feac9cbdc018e53ff5f772a8608fa44b +checksum=8227a6e8281cde12232894fef83760d44fa66b39ef033c61ed934a86c6dc75d4 make_check_pre="dbus-run-session xvfb-run" build_options="gir" diff --git a/srcpkgs/libsysstat/template b/srcpkgs/libsysstat/template index 674dc9d7665..f430962f1bf 100644 --- a/srcpkgs/libsysstat/template +++ b/srcpkgs/libsysstat/template @@ -1,6 +1,6 @@ # Template file for 'libsysstat' pkgname=libsysstat -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-base" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt.org/" distfiles="https://github.com/lxqt/libsysstat/releases/download/${version}/libsysstat-${version}.tar.xz" -checksum=f79b5e3e2e79a52b58fab5639f11b7a5f40e4a9995660181712cb4c4cd460435 +checksum=996e5e8c43b1364a81a660b56956948c628e919f1d73554df6be152bbec8d430 replaces="lxde-libsysstat>=0" libsysstat-devel_package() { diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template index df153d0b4df..c93a9966b5f 100644 --- a/srcpkgs/libzip/template +++ b/srcpkgs/libzip/template @@ -1,6 +1,6 @@ # Template file for 'libzip' pkgname=libzip -version=1.11.1 +version=1.11.2 revision=1 build_style=cmake hostmakedepends="perl groff pkg-config" @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="https://libzip.org/" changelog="https://raw.githubusercontent.com/nih-at/libzip/master/NEWS.md" distfiles="https://libzip.org/download/libzip-${version}.tar.gz" -checksum=c0e6fa52a62ba11efd30262290dc6970947aef32e0cc294ee50e9005ceac092a +checksum=6b2a43837005e1c23fdfee532b78f806863e412d2089b9c42b49ab08cbcd7665 post_install() { vlicense LICENSE diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template index ad96d3cc167..4785b7be6c7 100644 --- a/srcpkgs/limine/template +++ b/srcpkgs/limine/template @@ -1,6 +1,6 @@ # Template file for 'limine' pkgname=limine -version=8.1.2 +version=8.4.0 revision=1 build_style=gnu-configure configure_args="--enable-all TOOLCHAIN_FOR_TARGET=llvm" @@ -11,7 +11,7 @@ license="BSD-2-Clause" homepage="https://limine-bootloader.org/" changelog="https://raw.githubusercontent.com/limine-bootloader/limine/trunk/ChangeLog" distfiles="https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz" -checksum=2603cc0692d4d81302438e1ef63a21d9e6b3a9a4e3bcc8025ba14dc4f03375d9 +checksum=3122945dfc272f0fed5407e152829834651e3186fb29ae14580b71f51d5e491f post_install() { vlicense COPYING diff --git a/srcpkgs/linux-firmware/patches/no-whence.patch b/srcpkgs/linux-firmware/patches/no-whence.patch deleted file mode 100644 index 69e65c4ce27..00000000000 --- a/srcpkgs/linux-firmware/patches/no-whence.patch +++ /dev/null @@ -1,12 +0,0 @@ -this requires git ls-files to work --- ---- a/copy-firmware.sh -+++ b/copy-firmware.sh -@@ -66,7 +66,5 @@ - fi - --$verbose "Checking that WHENCE file is formatted properly" --./check_whence.py || err "check_whence.py has detected errors." - - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 7c2226c9697..4b6fe77d83c 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,6 +1,6 @@ # Template file for 'linux-firmware' pkgname=linux-firmware -version=20241017 +version=20241110 revision=1 hostmakedepends="rdfind which" depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}" @@ -10,7 +10,7 @@ license="custom:see /usr/share/licenses/linux-firmware" homepage="https://www.kernel.org/" changelog="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/" distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz" -checksum=551708bc71cb7ac67c800055aecb55e50eb3c86d13486c56250d1ef5132b39dc +checksum=c8a561dfdbd54157692fe166b84a173f9bc01f89c78f6196863beea2450e4938 python_version=3 nostrip=yes diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig index 19c2afc3841..0180802a086 100644 --- a/srcpkgs/linux5.10/files/arm64-dotconfig +++ b/srcpkgs/linux5.10/files/arm64-dotconfig @@ -1,14 +1,14 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.194 Kernel Configuration +# Linux/arm64 5.10.228 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 -CONFIG_LD_VERSION=239000000 +CONFIG_GCC_VERSION=130200 +CONFIG_LD_VERSION=241000000 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23900 +CONFIG_AS_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -363,6 +363,7 @@ CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_2457168=y +CONFIG_ARM64_ERRATUM_3194386=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -767,6 +768,7 @@ CONFIG_CRYPTO_CHACHA20_NEON=m CONFIG_CRYPTO_POLY1305_NEON=m CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_CRYPTO_AES_ARM64_BS=m +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -1694,10 +1696,8 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m @@ -1709,7 +1709,6 @@ CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_TAPRIO=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m @@ -1738,8 +1737,6 @@ CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_BPF=m @@ -1818,6 +1815,7 @@ CONFIG_QRTR_TUN=m CONFIG_QRTR_MHI=m CONFIG_NET_NCSI=y CONFIG_NCSI_OEM_CMD_GET_MAC=y +# CONFIG_NCSI_OEM_CMD_KEEP_PHY is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -4197,7 +4195,6 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m -# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_WDT87XX_I2C=m CONFIG_TOUCHSCREEN_WM97XX=m @@ -5608,7 +5605,6 @@ CONFIG_MFD_SC27XX_PMIC=m # CONFIG_MFD_STMPE is not set CONFIG_MFD_SUN6I_PRCM=y CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_LP3943=m # CONFIG_MFD_LP8788 is not set CONFIG_MFD_TI_LMU=m @@ -8206,8 +8202,6 @@ CONFIG_MMC_BCM2835=m CONFIG_MMC_MTK=m CONFIG_MMC_SDHCI_BRCMSTB=m CONFIG_MMC_SDHCI_XENON=m -# CONFIG_MMC_SDHCI_OMAP is not set -CONFIG_MMC_SDHCI_AM654=m CONFIG_MMC_OWL=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -9580,7 +9574,6 @@ CONFIG_TI_ADS7950=m CONFIG_TI_ADS8344=m # CONFIG_TI_ADS8688 is not set CONFIG_TI_ADS124S08=m -# CONFIG_TI_AM335X_ADC is not set CONFIG_TI_TLC4541=m # CONFIG_VF610_ADC is not set # CONFIG_VIPERBOARD_ADC is not set @@ -10569,8 +10562,8 @@ CONFIG_NFS_DEBUG=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m +CONFIG_NFSD_V2=y CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -10584,6 +10577,7 @@ CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y +CONFIG_NFS_V4_2_SSC_HELPER=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y @@ -10684,6 +10678,9 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig index ad274091157..3842e7f964a 100644 --- a/srcpkgs/linux5.10/files/i386-dotconfig +++ b/srcpkgs/linux5.10/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.10.219 Kernel Configuration +# Linux/i386 5.10.228 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -9087,8 +9087,8 @@ CONFIG_NFS_USE_KERNEL_DNS=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m +CONFIG_NFSD_V2=y CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -9102,6 +9102,7 @@ CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y +CONFIG_NFS_V4_2_SSC_HELPER=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y @@ -9203,6 +9204,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig index 18aa3481eee..674b0265704 100644 --- a/srcpkgs/linux5.10/files/x86_64-dotconfig +++ b/srcpkgs/linux5.10/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.10.219 Kernel Configuration +# Linux/x86_64 5.10.228 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -9255,8 +9255,8 @@ CONFIG_NFS_USE_KERNEL_DNS=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m +CONFIG_NFSD_V2=y CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -9270,6 +9270,7 @@ CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y +CONFIG_NFS_V4_2_SSC_HELPER=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y @@ -9371,6 +9372,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template index fa4cb192f6a..e716510d01e 100644 --- a/srcpkgs/linux5.10/template +++ b/srcpkgs/linux5.10/template @@ -1,6 +1,6 @@ # Template file for 'linux5.10' pkgname=linux5.10 -version=5.10.219 +version=5.10.228 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Leah Neukirchen " @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" checksum="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 - 15deb688afb02f2fa0e821cdfd92fcd783706be8b7ca3990054194e64fa9fee3" + e79744011effb3dd0b69b9e7166adaa4a7ba8232a820b6d4868a42eebb92e117" python_version=3 skip_extraction="patch-${version}.xz" diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig index b9f323cc335..adea9c32b53 100644 --- a/srcpkgs/linux5.15/files/arm64-dotconfig +++ b/srcpkgs/linux5.15/files/arm64-dotconfig @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.161 Kernel Configuration +# Linux/arm64 5.15.169 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 @@ -378,6 +378,7 @@ CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2067961=y +CONFIG_ARM64_ERRATUM_3194386=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -11193,6 +11194,9 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig index f43758e7b23..2ec06377d3b 100644 --- a/srcpkgs/linux5.15/files/i386-dotconfig +++ b/srcpkgs/linux5.15/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.15.161 Kernel Configuration +# Linux/i386 5.15.169 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -9507,6 +9507,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig index 47c6415caa2..4a8937078be 100644 --- a/srcpkgs/linux5.15/files/x86_64-dotconfig +++ b/srcpkgs/linux5.15/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.161 Kernel Configuration +# Linux/x86_64 5.15.169 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -9703,6 +9703,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template index 816dff7a9c1..b63bee1fa86 100644 --- a/srcpkgs/linux5.15/template +++ b/srcpkgs/linux5.15/template @@ -1,6 +1,6 @@ # Template file for 'linux5.15' pkgname=linux5.15 -version=5.15.161 +version=5.15.169 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Leah Neukirchen " @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8 - 702daa9fc1f8586fda3bc08d7d2191f287f65b2e7d3d5142ba7c30285d35e975" + 96438363dad25b4113dd43fbff11179db69140e342cc986a8f78b65559135749" skip_extraction="patch-${version}.xz" python_version=3 diff --git a/srcpkgs/linux6.1/files/arm64-dotconfig b/srcpkgs/linux6.1/files/arm64-dotconfig index 864f32e4523..9d138552953 100644 --- a/srcpkgs/linux6.1/files/arm64-dotconfig +++ b/srcpkgs/linux6.1/files/arm64-dotconfig @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.106 Kernel Configuration +# Linux/arm64 6.1.114 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 @@ -980,12 +980,12 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y -CONFIG_Z3FOLD=m +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set @@ -11743,6 +11743,9 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux6.1/files/i386-dotconfig b/srcpkgs/linux6.1/files/i386-dotconfig index ca9a5db42ef..4d34de3107a 100644 --- a/srcpkgs/linux6.1/files/i386-dotconfig +++ b/srcpkgs/linux6.1/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.1.106 Kernel Configuration +# Linux/i386 6.1.114 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -949,12 +949,12 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y -CONFIG_Z3FOLD=m +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set @@ -8665,7 +8665,6 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -CONFIG_INTEL_IOMMU_PERF_EVENTS=y CONFIG_HYPERV_IOMMU=y CONFIG_VIRTIO_IOMMU=m @@ -9632,7 +9631,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -9935,6 +9934,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux6.1/files/ppc-dotconfig b/srcpkgs/linux6.1/files/ppc-dotconfig index 42533d89a6e..03824e4753c 100644 --- a/srcpkgs/linux6.1/files/ppc-dotconfig +++ b/srcpkgs/linux6.1/files/ppc-dotconfig @@ -1,23 +1,24 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.1.0 Kernel Configuration +# Linux/powerpc 6.1.114 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23900 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23900 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=123 +CONFIG_PAHOLE_VERSION=127 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -152,7 +153,7 @@ CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 # end of Scheduler features CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y @@ -477,6 +478,7 @@ CONFIG_TASK_SIZE=0xb0000000 CONFIG_PPC_LIB_RHEAP=y CONFIG_VIRTUALIZATION=y CONFIG_HAVE_LIVEPATCH=y +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -505,7 +507,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y @@ -698,13 +699,13 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y -CONFIG_Z3FOLD=m -CONFIG_ZSMALLOC=m +# CONFIG_Z3FOLD_DEPRECATED is not set +CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set # @@ -735,6 +736,7 @@ CONFIG_COMPACTION=y CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_BOUNCE=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -756,6 +758,7 @@ CONFIG_USERFAULTFD=y CONFIG_LRU_GEN=y # CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_STATS is not set +CONFIG_LOCK_MM_AND_FIND_VMA=y # # Data Access Monitoring @@ -1344,10 +1347,8 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m @@ -1359,7 +1360,6 @@ CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_TAPRIO=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m @@ -1383,14 +1383,11 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_BPF=m @@ -2577,9 +2574,6 @@ CONFIG_I40EVF=m CONFIG_ICE=m # CONFIG_FM10K is not set CONFIG_IGC=m -CONFIG_NET_VENDOR_WANGXUN=y -CONFIG_NGBE=m -CONFIG_TXGBE=m CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y CONFIG_NET_VENDOR_LITEX=y @@ -2724,6 +2718,9 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WANGXUN=y +CONFIG_NGBE=m +CONFIG_TXGBE=m CONFIG_NET_VENDOR_WIZNET=y # CONFIG_WIZNET_W5100 is not set # CONFIG_WIZNET_W5300 is not set @@ -3867,7 +3864,6 @@ CONFIG_SPI_SIFIVE=m CONFIG_SPI_MXIC=m # CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set -# CONFIG_SPI_ZYNQMP_GQSPI is not set CONFIG_SPI_AMD=m # @@ -4405,7 +4401,6 @@ CONFIG_MFD_RT4831=m # CONFIG_MFD_SKY81452 is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_SYSCON is not set -# CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_TI_LMU is not set @@ -5016,10 +5011,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_AR0521=m # CONFIG_VIDEO_HI556 is not set CONFIG_VIDEO_HI846=m @@ -5087,7 +5079,6 @@ CONFIG_VIDEO_RDACM21=m # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set # CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices # # Lens drivers @@ -5444,7 +5435,6 @@ CONFIG_AGP_UNINORTH=y CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y -CONFIG_DRM_USE_DYNAMIC_DEBUG=y CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -5625,9 +5615,6 @@ CONFIG_DRM_SIMPLE_BRIDGE=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_LOGICVC is not set -CONFIG_DRM_MXS=y -# CONFIG_DRM_MXSFB is not set -CONFIG_DRM_IMX_LCDIF=m # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -5946,6 +5933,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y +# CONFIG_SND_HDA_CTL_DEV_ID is not set # end of HD-Audio CONFIG_SND_HDA_CORE=m @@ -7847,7 +7835,7 @@ CONFIG_NFS_USE_KERNEL_DNS=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y +# CONFIG_NFSD_V2 is not set CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -7884,7 +7872,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_FSCACHE=y # CONFIG_SMB_SERVER is not set -CONFIG_SMBFS_COMMON=m +CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set @@ -7969,6 +7957,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y @@ -8430,6 +8421,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_SPLIT is not set # CONFIG_DEBUG_INFO_BTF is not set CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y diff --git a/srcpkgs/linux6.1/files/ppc64-dotconfig b/srcpkgs/linux6.1/files/ppc64-dotconfig index 3a3ef8b6bd2..d819b5cd9c9 100644 --- a/srcpkgs/linux6.1/files/ppc64-dotconfig +++ b/srcpkgs/linux6.1/files/ppc64-dotconfig @@ -1,23 +1,24 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.1.2 Kernel Configuration +# Linux/powerpc 6.1.114 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23900 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23900 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=123 +CONFIG_PAHOLE_VERSION=127 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -164,7 +165,7 @@ CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -275,7 +276,7 @@ CONFIG_PPC64=y # CONFIG_PPC_BOOK3S_64=y # CONFIG_PPC_BOOK3E_64 is not set -CONFIG_GENERIC_CPU=y +CONFIG_POWERPC64_CPU=y # CONFIG_CELL_CPU is not set # CONFIG_PPC_970_CPU is not set # CONFIG_POWER6_CPU is not set @@ -283,6 +284,9 @@ CONFIG_GENERIC_CPU=y # CONFIG_POWER8_CPU is not set # CONFIG_POWER9_CPU is not set # CONFIG_POWER10_CPU is not set +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set +CONFIG_TARGET_CPU_BOOL=y +CONFIG_TARGET_CPU="power4" CONFIG_PPC_BOOK3S=y CONFIG_PPC_FPU_REGS=y CONFIG_PPC_FPU=y @@ -308,6 +312,8 @@ CONFIG_VDSO32=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_PPC64_ELF_ABI_V2=y +CONFIG_CC_HAS_ELFV2=y +CONFIG_CC_HAS_PREFIXED=y CONFIG_64BIT=y CONFIG_MMU=y CONFIG_ARCH_MMAP_RND_BITS_MAX=33 @@ -535,6 +541,7 @@ CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y CONFIG_ARCH_HAS_KEXEC_PURGATORY=y +CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2=y CONFIG_RELOCATABLE=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_CRASH_DUMP=y @@ -628,6 +635,7 @@ CONFIG_KVM_BOOK3S_64_HV=m # CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND is not set CONFIG_KVM_XICS=y CONFIG_KVM_XIVE=y +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -655,7 +663,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y @@ -865,12 +872,12 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y -CONFIG_Z3FOLD=m +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set @@ -919,6 +926,7 @@ CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -963,6 +971,7 @@ CONFIG_USERFAULTFD=y CONFIG_LRU_GEN=y # CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_STATS is not set +CONFIG_LOCK_MM_AND_FIND_VMA=y # # Data Access Monitoring @@ -1578,10 +1587,8 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m @@ -1593,7 +1600,6 @@ CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_TAPRIO=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m @@ -1617,14 +1623,11 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m # CONFIG_CLS_U32_PERF is not set # CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m # CONFIG_NET_CLS_CGROUP is not set CONFIG_NET_CLS_BPF=m @@ -3093,9 +3096,6 @@ CONFIG_ICE=m CONFIG_ICE_SWITCHDEV=y CONFIG_FM10K=m CONFIG_IGC=m -CONFIG_NET_VENDOR_WANGXUN=y -CONFIG_NGBE=m -CONFIG_TXGBE=m CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y # CONFIG_ADIN1110 is not set @@ -3255,7 +3255,6 @@ CONFIG_STMMAC_PLATFORM=m # CONFIG_DWMAC_DWC_QOS_ETH is not set CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_INTEL_PLAT=m -CONFIG_DWMAC_LOONGSON=m CONFIG_STMMAC_PCI=m CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m @@ -3278,6 +3277,9 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WANGXUN=y +CONFIG_NGBE=m +CONFIG_TXGBE=m CONFIG_NET_VENDOR_WIZNET=y CONFIG_WIZNET_W5100=m CONFIG_WIZNET_W5300=m @@ -4066,7 +4068,6 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m # CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_WDT87XX_I2C=m @@ -4292,7 +4293,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set # CONFIG_SERIAL_FSL_LINFLEXUART is not set CONFIG_SERIAL_CONEXANT_DIGICOLOR=m # CONFIG_SERIAL_MEN_Z135 is not set @@ -5114,7 +5114,6 @@ CONFIG_THERMAL_EMULATION=y CONFIG_THERMAL_MMIO=m CONFIG_MAX77620_THERMAL=m CONFIG_DA9062_THERMAL=m -# CONFIG_TI_SOC_THERMAL is not set CONFIG_GENERIC_ADC_THERMAL=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y @@ -5294,7 +5293,6 @@ CONFIG_STMPE_SPI=y # end of STMicroelectronics STMPE Interface Drivers CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_LP3943=m CONFIG_MFD_LP8788=y CONFIG_MFD_TI_LMU=m @@ -5989,10 +5987,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_AR0521 is not set CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m @@ -6060,7 +6055,6 @@ CONFIG_VIDEO_RDACM21=m # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set # CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices # # Lens drivers @@ -6414,7 +6408,6 @@ CONFIG_AGP_UNINORTH=m CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y -CONFIG_DRM_USE_DYNAMIC_DEBUG=y CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6629,9 +6622,6 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y CONFIG_DRM_LOGICVC=m -CONFIG_DRM_MXS=y -CONFIG_DRM_MXSFB=m -CONFIG_DRM_IMX_LCDIF=m CONFIG_DRM_ARCPGU=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6970,6 +6960,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y +# CONFIG_SND_HDA_CTL_DEV_ID is not set # end of HD-Audio CONFIG_SND_HDA_CORE=m @@ -7913,9 +7904,6 @@ CONFIG_MMC_HSQ=m CONFIG_MMC_TOSHIBA_PCI=m CONFIG_MMC_MTK=m # CONFIG_MMC_SDHCI_XENON is not set -CONFIG_MMC_SDHCI_OMAP=m -CONFIG_MMC_SDHCI_AM654=m -CONFIG_MMC_SDHCI_EXTERNAL_DMA=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y @@ -8947,7 +8935,6 @@ CONFIG_TI_ADS8344=m CONFIG_TI_ADS8688=m CONFIG_TI_ADS124S08=m CONFIG_TI_ADS131E08=m -CONFIG_TI_AM335X_ADC=m CONFIG_TI_TLC4541=m CONFIG_TI_TSC2046=m # CONFIG_TWL4030_MADC is not set @@ -9888,7 +9875,7 @@ CONFIG_NFS_USE_KERNEL_DNS=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y +# CONFIG_NFSD_V2 is not set CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -9927,7 +9914,7 @@ CONFIG_CIFS_SWN_UPCALL=y # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_CIFS_FSCACHE=y # CONFIG_SMB_SERVER is not set -CONFIG_SMBFS_COMMON=m +CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set @@ -10009,6 +9996,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y @@ -10511,6 +10501,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_SPLIT is not set # CONFIG_DEBUG_INFO_BTF is not set CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 CONFIG_STRIP_ASM_SYMS=y @@ -10675,6 +10666,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y diff --git a/srcpkgs/linux6.1/files/ppc64le-dotconfig b/srcpkgs/linux6.1/files/ppc64le-dotconfig index f1aeaa9295d..a189be51562 100644 --- a/srcpkgs/linux6.1/files/ppc64le-dotconfig +++ b/srcpkgs/linux6.1/files/ppc64le-dotconfig @@ -1,23 +1,24 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.1.8 Kernel Configuration +# Linux/powerpc 6.1.114 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23900 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23900 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=123 +CONFIG_PAHOLE_VERSION=127 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -161,8 +162,7 @@ CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -273,11 +273,14 @@ CONFIG_PPC64=y # CONFIG_PPC_BOOK3S_64=y # CONFIG_PPC_BOOK3E_64 is not set -CONFIG_GENERIC_CPU=y +CONFIG_POWERPC64_CPU=y # CONFIG_POWER7_CPU is not set # CONFIG_POWER8_CPU is not set # CONFIG_POWER9_CPU is not set # CONFIG_POWER10_CPU is not set +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set +CONFIG_TARGET_CPU_BOOL=y +CONFIG_TARGET_CPU="power8" CONFIG_PPC_BOOK3S=y CONFIG_PPC_FPU_REGS=y CONFIG_PPC_FPU=y @@ -304,6 +307,8 @@ CONFIG_VDSO32=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_PPC64_ELF_ABI_V2=y CONFIG_PPC64_BOOT_WRAPPER=y +CONFIG_CC_HAS_ELFV2=y +CONFIG_CC_HAS_PREFIXED=y CONFIG_64BIT=y CONFIG_MMU=y CONFIG_ARCH_MMAP_RND_BITS_MAX=33 @@ -553,6 +558,7 @@ CONFIG_KVM_BOOK3S_64_HV=m CONFIG_KVM_XICS=y CONFIG_KVM_XIVE=y CONFIG_HAVE_LIVEPATCH=y +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -581,7 +587,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y @@ -791,12 +796,12 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y -CONFIG_Z3FOLD=m +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set @@ -845,6 +850,7 @@ CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -889,6 +895,7 @@ CONFIG_USERFAULTFD=y CONFIG_LRU_GEN=y # CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_STATS is not set +CONFIG_LOCK_MM_AND_FIND_VMA=y # # Data Access Monitoring @@ -1504,10 +1511,8 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m @@ -1519,7 +1524,6 @@ CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_TAPRIO=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m @@ -1543,14 +1547,11 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m # CONFIG_CLS_U32_PERF is not set # CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m # CONFIG_NET_CLS_CGROUP is not set CONFIG_NET_CLS_BPF=m @@ -2945,9 +2946,6 @@ CONFIG_ICE=m CONFIG_ICE_SWITCHDEV=y CONFIG_FM10K=m CONFIG_IGC=m -CONFIG_NET_VENDOR_WANGXUN=y -CONFIG_NGBE=m -CONFIG_TXGBE=m CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y CONFIG_ADIN1110=m @@ -3102,7 +3100,6 @@ CONFIG_STMMAC_PLATFORM=m # CONFIG_DWMAC_DWC_QOS_ETH is not set CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_INTEL_PLAT=m -CONFIG_DWMAC_LOONGSON=m CONFIG_STMMAC_PCI=m CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m @@ -3122,6 +3119,9 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WANGXUN=y +CONFIG_NGBE=m +CONFIG_TXGBE=m CONFIG_NET_VENDOR_WIZNET=y CONFIG_WIZNET_W5100=m CONFIG_WIZNET_W5300=m @@ -3895,7 +3895,6 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m # CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_WDT87XX_I2C=m @@ -4120,7 +4119,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set CONFIG_SERIAL_FSL_LINFLEXUART=m CONFIG_SERIAL_CONEXANT_DIGICOLOR=m # CONFIG_SERIAL_MEN_Z135 is not set @@ -4908,7 +4906,6 @@ CONFIG_THERMAL_EMULATION=y CONFIG_THERMAL_MMIO=m CONFIG_MAX77620_THERMAL=m CONFIG_DA9062_THERMAL=m -# CONFIG_TI_SOC_THERMAL is not set CONFIG_GENERIC_ADC_THERMAL=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y @@ -5086,7 +5083,6 @@ CONFIG_STMPE_SPI=y # end of STMicroelectronics STMPE Interface Drivers CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_LP3943=m CONFIG_MFD_LP8788=y CONFIG_MFD_TI_LMU=m @@ -5781,10 +5777,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_AR0521=m CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m @@ -5852,7 +5845,6 @@ CONFIG_VIDEO_RDACM21=m # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set # CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices # # Lens drivers @@ -6205,7 +6197,6 @@ CONFIG_AGP=m CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y -CONFIG_DRM_USE_DYNAMIC_DEBUG=y CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6420,9 +6411,6 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y CONFIG_DRM_LOGICVC=m -CONFIG_DRM_MXS=y -# CONFIG_DRM_MXSFB is not set -CONFIG_DRM_IMX_LCDIF=m CONFIG_DRM_ARCPGU=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6728,6 +6716,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y +# CONFIG_SND_HDA_CTL_DEV_ID is not set # end of HD-Audio CONFIG_SND_HDA_CORE=m @@ -7651,9 +7640,6 @@ CONFIG_MMC_HSQ=m CONFIG_MMC_TOSHIBA_PCI=m CONFIG_MMC_MTK=m # CONFIG_MMC_SDHCI_XENON is not set -CONFIG_MMC_SDHCI_OMAP=m -CONFIG_MMC_SDHCI_AM654=m -CONFIG_MMC_SDHCI_EXTERNAL_DMA=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y @@ -8669,7 +8655,6 @@ CONFIG_TI_ADS8344=m CONFIG_TI_ADS8688=m CONFIG_TI_ADS124S08=m CONFIG_TI_ADS131E08=m -CONFIG_TI_AM335X_ADC=m CONFIG_TI_TLC4541=m CONFIG_TI_TSC2046=m # CONFIG_TWL4030_MADC is not set @@ -9610,7 +9595,7 @@ CONFIG_NFS_USE_KERNEL_DNS=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y +# CONFIG_NFSD_V2 is not set CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -9649,7 +9634,7 @@ CONFIG_CIFS_SWN_UPCALL=y # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_CIFS_FSCACHE=y # CONFIG_SMB_SERVER is not set -CONFIG_SMBFS_COMMON=m +CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set @@ -9731,6 +9716,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y @@ -10241,6 +10229,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_SPLIT is not set # CONFIG_DEBUG_INFO_BTF is not set CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 CONFIG_STRIP_ASM_SYMS=y diff --git a/srcpkgs/linux6.1/files/x86_64-dotconfig b/srcpkgs/linux6.1/files/x86_64-dotconfig index 041097afbd0..055e5f610c2 100644 --- a/srcpkgs/linux6.1/files/x86_64-dotconfig +++ b/srcpkgs/linux6.1/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.1.106 Kernel Configuration +# Linux/x86_64 6.1.114 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -997,20 +997,20 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set -CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set -# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set -CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" CONFIG_ZBUD=y -CONFIG_Z3FOLD=m +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=y -# CONFIG_ZSMALLOC_STAT is not set +CONFIG_ZSMALLOC_STAT=y # # SLAB allocator options @@ -4572,7 +4572,7 @@ CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set CONFIG_PINCTRL_AMD=y -# CONFIG_PINCTRL_CY8C95X0 is not set +CONFIG_PINCTRL_CY8C95X0=m CONFIG_PINCTRL_DA9062=m CONFIG_PINCTRL_MCP23S08_I2C=m CONFIG_PINCTRL_MCP23S08_SPI=m @@ -4587,22 +4587,22 @@ CONFIG_PINCTRL_CS47L90=y # Intel pinctrl drivers # CONFIG_PINCTRL_BAYTRAIL=y -CONFIG_PINCTRL_CHERRYVIEW=y +CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y -# CONFIG_PINCTRL_ALDERLAKE is not set +CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m CONFIG_PINCTRL_CEDARFORK=m CONFIG_PINCTRL_DENVERTON=m -# CONFIG_PINCTRL_ELKHARTLAKE is not set +CONFIG_PINCTRL_ELKHARTLAKE=m CONFIG_PINCTRL_EMMITSBURG=m CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_ICELAKE=m CONFIG_PINCTRL_JASPERLAKE=m -# CONFIG_PINCTRL_LAKEFIELD is not set +CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m -CONFIG_PINCTRL_METEORLAKE=y +CONFIG_PINCTRL_METEORLAKE=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -8884,7 +8884,6 @@ CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -CONFIG_INTEL_IOMMU_PERF_EVENTS=y CONFIG_IRQ_REMAP=y CONFIG_HYPERV_IOMMU=y CONFIG_VIRTIO_IOMMU=m @@ -9872,7 +9871,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -10184,6 +10183,9 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y diff --git a/srcpkgs/linux6.1/patches/fix-musl-btf-ids.patch b/srcpkgs/linux6.1/patches/fix-musl-btf-ids.patch deleted file mode 100644 index bec96095197..00000000000 --- a/srcpkgs/linux6.1/patches/fix-musl-btf-ids.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugzilla.kernel.org/show_bug.cgi?id=218647 - -diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h -index 72535f00572f..72ea363d434d 100644 ---- a/tools/include/linux/btf_ids.h -+++ b/tools/include/linux/btf_ids.h -@@ -3,6 +3,8 @@ - #ifndef _LINUX_BTF_IDS_H - #define _LINUX_BTF_IDS_H - -+#include /* for u32 */ -+ - struct btf_id_set { - u32 cnt; - u32 ids[]; diff --git a/srcpkgs/linux6.1/patches/fix-musl-objtool.patch b/srcpkgs/linux6.1/patches/fix-musl-objtool.patch index b7d0b6a83cb..1fb7ae64fd7 100644 --- a/srcpkgs/linux6.1/patches/fix-musl-objtool.patch +++ b/srcpkgs/linux6.1/patches/fix-musl-objtool.patch @@ -1,8 +1,6 @@ objtool is using the headers provided by kernel-libc-headers, which are kernel version 5.10, so they use __always_inline instead of inline, and musl doesn't define __always_inline (glibc does) -diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile -index 92ce4fc..d74b931 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -30,7 +30,7 @@ INCLUDES := -I$(srctree)/tools/include \ diff --git a/srcpkgs/linux6.1/patches/ppc-vas-on-4k.patch b/srcpkgs/linux6.1/patches/ppc-vas-on-4k.patch index 408b0905962..4426914a19a 100644 --- a/srcpkgs/linux6.1/patches/ppc-vas-on-4k.patch +++ b/srcpkgs/linux6.1/patches/ppc-vas-on-4k.patch @@ -1,5 +1,3 @@ -diff --git a/arch/powerpc/platforms/book3s/Kconfig b/arch/powerpc/platforms/book3s/Kconfig -index 34c9315..88f4f87 100644 --- a/arch/powerpc/platforms/book3s/Kconfig +++ b/arch/powerpc/platforms/book3s/Kconfig @@ -1,7 +1,7 @@ diff --git a/srcpkgs/linux6.1/patches/ppc64-be-elfv2.patch b/srcpkgs/linux6.1/patches/ppc64-be-elfv2.patch deleted file mode 100644 index 8c57150d6e2..00000000000 --- a/srcpkgs/linux6.1/patches/ppc64-be-elfv2.patch +++ /dev/null @@ -1,37 +0,0 @@ -This makes the Linux kernel build as ELFv2 on big endian ppc64. The upstream -doesn't seem to be interested in this but it's a small patch that is unlikely -to break/easy to remake and in worst case can always be ditched. - -Using ELFv2 has some potential performance benefits and is already always used -on little endian. It requires a relatively modern toolchain, which we already -have. - -Ping q66 if it does not apply. - ---- a/drivers/crypto/vmx/Makefile -+++ b/drivers/crypto/vmx/Makefile -@@ -3,7 +3,7 @@ obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += - vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o - - quiet_cmd_perl = PERL $@ -- cmd_perl = $(PERL) $< $(if $(CONFIG_CPU_LITTLE_ENDIAN), linux-ppc64le, linux-ppc64) > $@ -+ cmd_perl = $(PERL) $< $(if $(CONFIG_CPU_LITTLE_ENDIAN), linux-ppc64le, linux-ppc64v2) > $@ - - targets += aesp8-ppc.S ghashp8-ppc.S - ---- a/arch/powerpc/platforms/Kconfig.cputype -+++ b/arch/powerpc/platforms/Kconfig.cputype -@@ -554,10 +554,11 @@ config CPU_LITTLE_ENDIAN - endchoice - - config PPC64_ELF_ABI_V1 -- def_bool PPC64 && CPU_BIG_ENDIAN -+ def_bool n -+ depends on PPC64 && CPU_BIG_ENDIAN - - config PPC64_ELF_ABI_V2 -- def_bool PPC64 && CPU_LITTLE_ENDIAN -+ def_bool PPC64 - - config PPC64_BOOT_WRAPPER - def_bool n diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template index 181a1f0bc72..5bb604203c6 100644 --- a/srcpkgs/linux6.1/template +++ b/srcpkgs/linux6.1/template @@ -1,6 +1,6 @@ # Template file for 'linux6.1' pkgname=linux6.1 -version=6.1.106 +version=6.1.114 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Đoàn Trần Công Danh " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb - 3f410c3cb279b52a0a5efa85a6545bd981444e3d7080f4c90c212dcd199b1585" + 8fdfbfc1610438012de1c936ed342f2908c96f73d1f9e2c37c57cd769bb0a4b8" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. diff --git a/srcpkgs/linux6.10/files/i386-dotconfig b/srcpkgs/linux6.10/files/i386-dotconfig index 2e4ac7c993b..4c11cfa95fd 100644 --- a/srcpkgs/linux6.10/files/i386-dotconfig +++ b/srcpkgs/linux6.10/files/i386-dotconfig @@ -9917,7 +9917,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_QUOTA_DEBUG is not set diff --git a/srcpkgs/linux6.10/files/x86_64-dotconfig b/srcpkgs/linux6.10/files/x86_64-dotconfig index 701f6a5f961..f12353f8690 100644 --- a/srcpkgs/linux6.10/files/x86_64-dotconfig +++ b/srcpkgs/linux6.10/files/x86_64-dotconfig @@ -4696,6 +4696,7 @@ CONFIG_SPI_AXI_SPI_ENGINE=m CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_CADENCE=m +CONFIG_SPI_CS42L43=m CONFIG_SPI_DESIGNWARE=m CONFIG_SPI_DW_DMA=y CONFIG_SPI_DW_PCI=m @@ -4785,13 +4786,13 @@ CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set CONFIG_PINCTRL_AMD=y -# CONFIG_PINCTRL_CY8C95X0 is not set +CONFIG_PINCTRL_CY8C95X0=m CONFIG_PINCTRL_DA9062=m CONFIG_PINCTRL_MCP23S08_I2C=m CONFIG_PINCTRL_MCP23S08_SPI=m CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_SX150X=y -# CONFIG_PINCTRL_CS42L43 is not set +CONFIG_PINCTRL_CS42L43=m CONFIG_PINCTRL_MADERA=m CONFIG_PINCTRL_CS47L35=y CONFIG_PINCTRL_CS47L85=y @@ -4804,21 +4805,21 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y -# CONFIG_PINCTRL_INTEL_PLATFORM is not set -# CONFIG_PINCTRL_ALDERLAKE is not set +CONFIG_PINCTRL_INTEL_PLATFORM=m +CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m CONFIG_PINCTRL_CEDARFORK=m CONFIG_PINCTRL_DENVERTON=m -# CONFIG_PINCTRL_ELKHARTLAKE is not set +CONFIG_PINCTRL_ELKHARTLAKE=m CONFIG_PINCTRL_EMMITSBURG=m CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_ICELAKE=m CONFIG_PINCTRL_JASPERLAKE=m -# CONFIG_PINCTRL_LAKEFIELD is not set +CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m -CONFIG_PINCTRL_METEORLAKE=y -# CONFIG_PINCTRL_METEORPOINT is not set +CONFIG_PINCTRL_METEORLAKE=m +CONFIG_PINCTRL_METEORPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -8389,6 +8390,7 @@ CONFIG_LEDS_TRIGGER_TTY=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC_APOLLOLAKE=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC_F7188X=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_ELKHARTLAKE=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y @@ -9164,6 +9166,8 @@ CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_SIEMENS_SIMATIC_IPC=m CONFIG_SIEMENS_SIMATIC_IPC_BATT=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m # CONFIG_SILICOM_PLATFORM is not set # CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_SEL3350_PLATFORM is not set @@ -10312,7 +10316,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_QUOTA_DEBUG is not set diff --git a/srcpkgs/linux6.11/files/arm64-dotconfig b/srcpkgs/linux6.11/files/arm64-dotconfig index 0ebfaab94e5..89be5e413a1 100644 --- a/srcpkgs/linux6.11/files/arm64-dotconfig +++ b/srcpkgs/linux6.11/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.11.4 Kernel Configuration +# Linux/arm64 6.11.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -553,7 +553,6 @@ CONFIG_ARM64_EPAN=y # end of ARMv8.7 architectural features CONFIG_ARM64_SVE=y -CONFIG_ARM64_SME=y CONFIG_ARM64_PSEUDO_NMI=y # CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set CONFIG_RELOCATABLE=y @@ -2529,7 +2528,6 @@ CONFIG_QCOM_SCM=y CONFIG_QCOM_TZMEM=y CONFIG_QCOM_TZMEM_MODE_GENERIC=y # CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set -# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set CONFIG_QCOM_QSEECOM=y CONFIG_QCOM_QSEECOM_UEFISECAPP=y # end of Qualcomm firmware drivers @@ -3930,6 +3928,7 @@ CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCMCIA=m CONFIG_CAN_PLX_PCI=m +# CONFIG_CAN_SJA1000_ISA is not set # CONFIG_CAN_SJA1000_PLATFORM is not set CONFIG_CAN_SOFTING=m CONFIG_CAN_SOFTING_CS=m diff --git a/srcpkgs/linux6.11/files/i386-dotconfig b/srcpkgs/linux6.11/files/i386-dotconfig index 176f19271b9..610ca9cd1af 100644 --- a/srcpkgs/linux6.11/files/i386-dotconfig +++ b/srcpkgs/linux6.11/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.11.4 Kernel Configuration +# Linux/i386 6.11.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -3395,6 +3395,7 @@ CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CAN_C_CAN_PCI=m CONFIG_CAN_CC770=m +# CONFIG_CAN_CC770_ISA is not set CONFIG_CAN_CC770_PLATFORM=m # CONFIG_CAN_CTUCANFD_PCI is not set # CONFIG_CAN_ESD_402_PCI is not set @@ -9975,7 +9976,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_QUOTA_DEBUG is not set diff --git a/srcpkgs/linux6.11/files/x86_64-dotconfig b/srcpkgs/linux6.11/files/x86_64-dotconfig index 599190045d2..780cb14a4a8 100644 --- a/srcpkgs/linux6.11/files/x86_64-dotconfig +++ b/srcpkgs/linux6.11/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.11.4 Kernel Configuration +# Linux/x86_64 6.11.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -521,7 +521,6 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_DYNAMIC_MEMORY_LAYOUT=y CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa -# CONFIG_ADDRESS_MASKING is not set CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set # CONFIG_LEGACY_VSYSCALL_XONLY is not set @@ -3604,6 +3603,7 @@ CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CAN_C_CAN_PCI=m CONFIG_CAN_CC770=m +# CONFIG_CAN_CC770_ISA is not set CONFIG_CAN_CC770_PLATFORM=m CONFIG_CAN_CTUCANFD=m CONFIG_CAN_CTUCANFD_PCI=m @@ -4806,7 +4806,7 @@ CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set CONFIG_PINCTRL_AMD=y -# CONFIG_PINCTRL_CY8C95X0 is not set +CONFIG_PINCTRL_CY8C95X0=m CONFIG_PINCTRL_DA9062=m CONFIG_PINCTRL_MCP23S08_I2C=m CONFIG_PINCTRL_MCP23S08_SPI=m @@ -4825,21 +4825,21 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y -# CONFIG_PINCTRL_INTEL_PLATFORM is not set -# CONFIG_PINCTRL_ALDERLAKE is not set +CONFIG_PINCTRL_INTEL_PLATFORM=m +CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m CONFIG_PINCTRL_CEDARFORK=m CONFIG_PINCTRL_DENVERTON=m -# CONFIG_PINCTRL_ELKHARTLAKE is not set +CONFIG_PINCTRL_ELKHARTLAKE=m CONFIG_PINCTRL_EMMITSBURG=m CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_ICELAKE=m CONFIG_PINCTRL_JASPERLAKE=m -# CONFIG_PINCTRL_LAKEFIELD is not set +CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m -CONFIG_PINCTRL_METEORLAKE=y -# CONFIG_PINCTRL_METEORPOINT is not set +CONFIG_PINCTRL_METEORLAKE=m +CONFIG_PINCTRL_METEORPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -8446,6 +8446,7 @@ CONFIG_LEDS_TRIGGER_TTY=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC_APOLLOLAKE=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC_F7188X=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_ELKHARTLAKE=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y @@ -9224,6 +9225,8 @@ CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_SIEMENS_SIMATIC_IPC=m CONFIG_SIEMENS_SIMATIC_IPC_BATT=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m # CONFIG_SILICOM_PLATFORM is not set # CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_SEL3350_PLATFORM is not set @@ -10376,7 +10379,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_QUOTA_DEBUG is not set diff --git a/srcpkgs/linux6.11/template b/srcpkgs/linux6.11/template index 29cf9df48c8..92fb4a2b59d 100644 --- a/srcpkgs/linux6.11/template +++ b/srcpkgs/linux6.11/template @@ -1,6 +1,6 @@ # Template file for 'linux6.11' pkgname=linux6.11 -version=6.11.4 +version=6.11.8 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e - d0c22d3f7a5ea64938cb8a003e6f6ad3226a0dab855e89fa0fff3578946c9498" + 99495093dfcec22343c426d90fca29691a7a70e64b6b0fe0da91758a5bfaa28f" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. diff --git a/srcpkgs/linux6.6/files/arm64-dotconfig b/srcpkgs/linux6.6/files/arm64-dotconfig index 4e877ffc750..9f5c81badd6 100644 --- a/srcpkgs/linux6.6/files/arm64-dotconfig +++ b/srcpkgs/linux6.6/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.57 Kernel Configuration +# Linux/arm64 6.6.61 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -545,7 +545,6 @@ CONFIG_ARM64_EPAN=y # end of ARMv8.7 architectural features CONFIG_ARM64_SVE=y -CONFIG_ARM64_SME=y CONFIG_ARM64_PSEUDO_NMI=y # CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set CONFIG_RELOCATABLE=y diff --git a/srcpkgs/linux6.6/files/i386-dotconfig b/srcpkgs/linux6.6/files/i386-dotconfig index 31714ac7550..5a63bb6cf3f 100644 --- a/srcpkgs/linux6.6/files/i386-dotconfig +++ b/srcpkgs/linux6.6/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.6.57 Kernel Configuration +# Linux/i386 6.6.61 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -9743,7 +9743,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_QUOTA_DEBUG is not set diff --git a/srcpkgs/linux6.6/files/x86_64-dotconfig b/srcpkgs/linux6.6/files/x86_64-dotconfig index 0273ffccc22..c89e102da96 100644 --- a/srcpkgs/linux6.6/files/x86_64-dotconfig +++ b/srcpkgs/linux6.6/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.6.57 Kernel Configuration +# Linux/x86_64 6.6.61 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -512,7 +512,6 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_DYNAMIC_MEMORY_LAYOUT=y CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa -# CONFIG_ADDRESS_MASKING is not set CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set # CONFIG_LEGACY_VSYSCALL_XONLY is not set @@ -4742,7 +4741,7 @@ CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set CONFIG_PINCTRL_AMD=y -# CONFIG_PINCTRL_CY8C95X0 is not set +CONFIG_PINCTRL_CY8C95X0=m CONFIG_PINCTRL_DA9062=m CONFIG_PINCTRL_MCP23S08_I2C=m CONFIG_PINCTRL_MCP23S08_SPI=m @@ -4760,19 +4759,19 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y -# CONFIG_PINCTRL_ALDERLAKE is not set +CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m CONFIG_PINCTRL_CEDARFORK=m CONFIG_PINCTRL_DENVERTON=m -# CONFIG_PINCTRL_ELKHARTLAKE is not set +CONFIG_PINCTRL_ELKHARTLAKE=m CONFIG_PINCTRL_EMMITSBURG=m CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_ICELAKE=m CONFIG_PINCTRL_JASPERLAKE=m -# CONFIG_PINCTRL_LAKEFIELD is not set +CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m -CONFIG_PINCTRL_METEORLAKE=y +CONFIG_PINCTRL_METEORLAKE=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -8258,6 +8257,7 @@ CONFIG_LEDS_TRIGGER_TTY=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC_APOLLOLAKE=m CONFIG_LEDS_SIEMENS_SIMATIC_IPC_F7188X=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_ELKHARTLAKE=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y @@ -9023,6 +9023,8 @@ CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_SIEMENS_SIMATIC_IPC=m CONFIG_SIEMENS_SIMATIC_IPC_BATT=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m # CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_SEL3350_PLATFORM is not set CONFIG_P2SB=y @@ -10106,7 +10108,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_QUOTA_DEBUG is not set diff --git a/srcpkgs/linux6.6/template b/srcpkgs/linux6.6/template index e0d9338c615..7c99db42560 100644 --- a/srcpkgs/linux6.6/template +++ b/srcpkgs/linux6.6/template @@ -1,6 +1,6 @@ # Template file for 'linux6.6' pkgname=linux6.6 -version=6.6.57 +version=6.6.61 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0 - eb5caa3b7140c9810a86780f9d0a4f29cce2b7c33d786c39c6b6df51db0e761e" + f1301fae41af2f92c2d1197799c90ee351c383fd09ab22a7edf74d906ee5b305" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. diff --git a/srcpkgs/lld19 b/srcpkgs/lld19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/lld19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/lld19-devel b/srcpkgs/lld19-devel new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/lld19-devel @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/lldb-devel18 b/srcpkgs/lldb-devel18 deleted file mode 120000 index 1f418dc969a..00000000000 --- a/srcpkgs/lldb-devel18 +++ /dev/null @@ -1 +0,0 @@ -llvm18 \ No newline at end of file diff --git a/srcpkgs/lldb19 b/srcpkgs/lldb19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/lldb19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/lldb19-devel b/srcpkgs/lldb19-devel new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/lldb19-devel @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/llvm-bolt19 b/srcpkgs/llvm-bolt19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/llvm-bolt19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/llvm-libunwind b/srcpkgs/llvm-libunwind index 1f418dc969a..985027fe0a5 120000 --- a/srcpkgs/llvm-libunwind +++ b/srcpkgs/llvm-libunwind @@ -1 +1 @@ -llvm18 \ No newline at end of file +llvm19 \ No newline at end of file diff --git a/srcpkgs/llvm-libunwind-devel b/srcpkgs/llvm-libunwind-devel index 1f418dc969a..985027fe0a5 120000 --- a/srcpkgs/llvm-libunwind-devel +++ b/srcpkgs/llvm-libunwind-devel @@ -1 +1 @@ -llvm18 \ No newline at end of file +llvm19 \ No newline at end of file diff --git a/srcpkgs/llvm-libunwind-devel18 b/srcpkgs/llvm-libunwind-devel18 deleted file mode 120000 index 1f418dc969a..00000000000 --- a/srcpkgs/llvm-libunwind-devel18 +++ /dev/null @@ -1 +0,0 @@ -llvm18 \ No newline at end of file diff --git a/srcpkgs/llvm-libunwind18 b/srcpkgs/llvm-libunwind18 deleted file mode 120000 index 1f418dc969a..00000000000 --- a/srcpkgs/llvm-libunwind18 +++ /dev/null @@ -1 +0,0 @@ -llvm18 \ No newline at end of file diff --git a/srcpkgs/llvm18/template b/srcpkgs/llvm18/template index 1311ecf6fc6..fd8b92e8d05 100644 --- a/srcpkgs/llvm18/template +++ b/srcpkgs/llvm18/template @@ -47,7 +47,8 @@ conflicts="llvm17>=0 llvm15>=0" lib32disabled=yes python_version=3 -build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt openmp lto graphviz" +build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt + openmp libcxx libunwind lto graphviz" build_options_default="clang clang_tools_extra lld mlir libclc polly lldb openmp" if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then @@ -128,13 +129,14 @@ if [ "$build_option_openmp" ]; then fi # enable if runtime subpackages link to this version of llvm -if true; then +if [ "$build_option_libunwind" ]; then subpackages+=" llvm-libunwind llvm-libunwind-devel " _enabled_runtimes+=";libunwind" +fi +if [ "$build_option_libcxx" ]; then subpackages+=" libcxx libcxx-devel libcxxabi libcxxabi-devel " _enabled_runtimes+=";libcxxabi;libcxx" - fi configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}" @@ -281,31 +283,38 @@ post_install() { rm -rf ${DESTDIR}/usr/share/gdb - # Install libcxxabi headers - vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include - vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include + if [ "$build_option_libcxx" ]; then + # Install libcxxabi headers + vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include + vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include - # Install libunwind headers - vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include - vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include - vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include - vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \ - 644 usr/include/mach-o + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr \ + -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/cmake_install.cmake - # Install libcxx and libunwind docs - cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/cmake_install.cmake - cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/cmake_install.cmake + LIBCXX_DOCS=usr/share/doc/LLVM/libcxx + vmkdir ${LIBCXX_DOCS} + vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/html ${LIBCXX_DOCS} + fi + + + if [ "$build_option_libunwind" ]; then + # Install libunwind headers + vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include + vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include + vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include + vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \ + 644 usr/include/mach-o + + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr \ + -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/cmake_install.cmake + + LIBUNWIND_DOCS=usr/share/doc/LLVM/libunwind + vmkdir ${LIBUNWIND_DOCS} + vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/html ${LIBUNWIND_DOCS} + fi # Can this be disabled some other way? rm -rf ${DESTDIR}/usr/lib64 - - LIBCXX_DOCS=usr/share/doc/LLVM/libcxx - vmkdir ${LIBCXX_DOCS} - vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/html ${LIBCXX_DOCS} - - LIBUNWIND_DOCS=usr/share/doc/LLVM/libunwind - vmkdir ${LIBUNWIND_DOCS} - vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/html ${LIBUNWIND_DOCS} } clang18_package() { diff --git a/srcpkgs/llvm19-bootstrap/patches b/srcpkgs/llvm19-bootstrap/patches new file mode 120000 index 00000000000..61bc4babf37 --- /dev/null +++ b/srcpkgs/llvm19-bootstrap/patches @@ -0,0 +1 @@ +../llvm19/patches \ No newline at end of file diff --git a/srcpkgs/llvm19-bootstrap/template b/srcpkgs/llvm19-bootstrap/template new file mode 100644 index 00000000000..c209a3360d0 --- /dev/null +++ b/srcpkgs/llvm19-bootstrap/template @@ -0,0 +1,73 @@ +# Template file for 'llvm19-bootstrap' +pkgname=llvm19-bootstrap +version=19.1.3 +revision=1 +build_wrksrc=llvm +build_style=cmake +configure_args=" + -DCMAKE_BUILD_TYPE=Release -Wno-dev + -DENABLE_LINKER_BUILD_ID=YES + -DLLVM_INSTALL_UTILS=YES + -DLLVM_BINUTILS_INCDIR=/usr/include + -DBASE_LLVM_VERSION=${version} + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr + -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO + -DLLVM_TARGETS_TO_BUILD=Native + -DLLVM_ENABLE_PROJECTS=clang;lld +" +hostmakedepends="perl python3 pkg-config" +makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel + libxml2-devel binutils-devel z3-devel SPIRV-Headers SPIRV-Tools-devel" +short_desc="LLVM Compiler Infrastructure Project - Version 19" +maintainer="Daniel Martinez " +license="Apache-2.0 AND NCSA AND custom:Apache-2.0-with-llvm-exception" +homepage="https://www.llvm.org" +_spirv_version=v19.1.1 +distfiles="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${version}.tar.gz + https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/${_spirv_version}.tar.gz" +checksum="e5106e2bef341b3f5e41340e4b6c6a58259f4021ad801acf14e88f1a84567b05 + 7f6f7a1af0eb40910ddf3a7647d2186c8c5dc5a47945afa935aeec56bacf4336" +skip_extraction=${_spirv_version}.tar.gz +conflicts="llvm19>=0 llvm18>=0 llvm17>=0 llvm15>=0" +lib32disabled=yes +python_version=3 +nodebug=yes +repository=bootstrap +nocross="bootstrap package" + +# fails to build with libquadmth on musl +case "$XBPS_TARGET_MACHINE" in + x86_64|i686) makedepends+=" libquadmath-devel" ;; +esac + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES + -DCOMPILER_RT_BUILD_GWP_ASAN=OFF" +fi + +case "$XBPS_TARGET_MACHINE" in + i686*) _arch="X86";; + x86_64*) _arch="X86";; + armv5*) _arch="Armv5te";; + armv6*) _arch="Armv6";; + armv7*) _arch="Armv7";; + aarch64*) _arch="AArch64";; + mips*) _arch="Mips";; + ppc*) _arch="PowerPC";; + riscv64*) _arch="RISCV64";; +esac + +configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" + +pre_configure() { + configure_args+=" -DLLVM_HOST_TRIPLE=$($CC -dumpmachine)" + configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=$($CXX -dumpmachine)" +} + +post_extract() { + vsrcextract -C llvm/projects/llvm-spirv ${_spirv_version}.tar.gz +} + +post_install() { + vlicense ${wrksrc}/LICENSE.TXT +} diff --git a/srcpkgs/llvm19-cross-tools b/srcpkgs/llvm19-cross-tools new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/llvm19-cross-tools @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/llvm19-devel b/srcpkgs/llvm19-devel new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/llvm19-devel @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/llvm19-doc b/srcpkgs/llvm19-doc new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/llvm19-doc @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/llvm19/files/llvm-Config-llvm-config.h b/srcpkgs/llvm19/files/llvm-Config-llvm-config.h new file mode 100644 index 00000000000..2fa08c9be69 --- /dev/null +++ b/srcpkgs/llvm19/files/llvm-Config-llvm-config.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "llvm-config-32.h" +#elif __WORDSIZE == 64 +#include "llvm-config-64.h" +#else +#error "Unknown word size" +#endif diff --git a/srcpkgs/llvm19/patches/SmallVector.patch b/srcpkgs/llvm19/patches/SmallVector.patch new file mode 100644 index 00000000000..ac10d306c43 --- /dev/null +++ b/srcpkgs/llvm19/patches/SmallVector.patch @@ -0,0 +1,13 @@ +diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h +index 2e6d2dc6ce90..be2cf6cc1fee 100644 +--- a/llvm/include/llvm/ADT/SmallVector.h ++++ b/llvm/include/llvm/ADT/SmallVector.h +@@ -1163,7 +1163,7 @@ template struct CalculateSmallVectorDefaultInlinedElements { + // happens on a 32-bit host and then fails due to sizeof(T) *increasing* on a + // 64-bit host, is expected to be very rare. + static_assert( +- sizeof(T) <= 256, ++ sizeof(T) <= 288, + "You are trying to use a default number of inlined elements for " + "`SmallVector` but `sizeof(T)` is really big! Please use an " + "explicit number of inlined elements with `SmallVector` to make " diff --git a/srcpkgs/llvm19/patches/always-set-a-larger-stack-size-explicitly.patch b/srcpkgs/llvm19/patches/always-set-a-larger-stack-size-explicitly.patch new file mode 100644 index 00000000000..cb17121dea2 --- /dev/null +++ b/srcpkgs/llvm19/patches/always-set-a-larger-stack-size-explicitly.patch @@ -0,0 +1,37 @@ +From 2354350bcc890c13016d67f4c060b32cb1cd693c Mon Sep 17 00:00:00 2001 +From: q66 +Date: Sat, 4 Nov 2023 08:44:01 +0100 +Subject: [PATCH 01/25] llvm: always set a larger stack size explicitly + +--- + llvm/lib/Support/Threading.cpp | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp +index 7cc7ba44c..b91b8f4bb 100644 +--- a/llvm/lib/Support/Threading.cpp ++++ b/llvm/lib/Support/Threading.cpp +@@ -77,21 +77,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const { + // keyword. + #include "llvm/Support/thread.h" + +-#if defined(__APPLE__) +- // Darwin's default stack size for threads except the main one is only 512KB, +- // which is not enough for some/many normal LLVM compilations. This implements +- // the same interface as std::thread but requests the same stack size as the +- // main thread (8MB) before creation. + const std::optional llvm::thread::DefaultStackSize = 8 * 1024 * 1024; +-#elif defined(_AIX) +- // On AIX, the default pthread stack size limit is ~192k for 64-bit programs. +- // This limit is easily reached when doing link-time thinLTO. AIX library +- // developers have used 4MB, so we'll do the same. +-const std::optional llvm::thread::DefaultStackSize = 4 * 1024 * 1024; +-#else +-const std::optional llvm::thread::DefaultStackSize; +-#endif +- + + #endif + +-- +2.42.0 diff --git a/srcpkgs/llvm19/patches/clang-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm19/patches/clang-001-fix-unwind-chain-inclusion.patch new file mode 100644 index 00000000000..e4eaa7783e7 --- /dev/null +++ b/srcpkgs/llvm19/patches/clang-001-fix-unwind-chain-inclusion.patch @@ -0,0 +1,44 @@ +From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:14:57 +0200 +Subject: [PATCH 2/7] fix unwind chain inclusion + +--- + lib/Headers/unwind.h | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h +index 303d792..44e10cc 100644 +--- a/clang/lib/Headers/unwind.h ++++ b/clang/lib/Headers/unwind.h +@@ -9,9 +9,6 @@ + + /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ + +-#ifndef __CLANG_UNWIND_H +-#define __CLANG_UNWIND_H +- + #if defined(__APPLE__) && __has_include_next() + /* Darwin (from 11.x on) provide an unwind.h. If that's available, + * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, +@@ -39,6 +36,9 @@ + # endif + #else + ++#ifndef __CLANG_UNWIND_H ++#define __CLANG_UNWIND_H ++ + #include + + #ifdef __cplusplus +@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *); + } + #endif + ++#endif /* __CLANG_UNWIND_H */ ++ + #endif + +-#endif /* __CLANG_UNWIND_H */ +-- +2.5.1 diff --git a/srcpkgs/llvm19/patches/clang-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm19/patches/clang-003-ppc64-dynamic-linker-path.patch new file mode 100644 index 00000000000..4ad6412d1e6 --- /dev/null +++ b/srcpkgs/llvm19/patches/clang-003-ppc64-dynamic-linker-path.patch @@ -0,0 +1,13 @@ +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -504,10 +504,6 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { + Loader = "ld.so.1"; + break; + case llvm::Triple::ppc64: +- LibDir = "lib64"; +- Loader = +- (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1"; +- break; + case llvm::Triple::ppc64le: + LibDir = "lib64"; + Loader = diff --git a/srcpkgs/llvm19/patches/compiler-rt-sanitizer-ppc64-musl.patch b/srcpkgs/llvm19/patches/compiler-rt-sanitizer-ppc64-musl.patch new file mode 100644 index 00000000000..3aed07b8569 --- /dev/null +++ b/srcpkgs/llvm19/patches/compiler-rt-sanitizer-ppc64-musl.patch @@ -0,0 +1,37 @@ +--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +@@ -74,6 +74,10 @@ + # include + # endif + ++#if SANITIZER_LINUX && defined(__powerpc__) ++#include ++#endif ++ + # if SANITIZER_LINUX && !SANITIZER_ANDROID + # include + # endif +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -94,7 +94,7 @@ + # include + # include + # if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \ +- defined(__hexagon__) || defined(__loongarch__) ||SANITIZER_RISCV64 ++ defined(__hexagon__) || defined(__powerpc__) || defined(__loongarch__) ||SANITIZER_RISCV64 + # include + # ifdef __arm__ + typedef struct user_fpregs elf_fpregset_t; +--- a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp +@@ -31,7 +31,7 @@ + #include // for pid_t + #include // for iovec + #include // for NT_PRSTATUS +-#if (defined(__aarch64__) || SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \ +- !SANITIZER_ANDROID ++#if (defined(__aarch64__) || defined(__powerpc__) ||SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \ ++ !SANITIZER_ANDROID + // GLIBC 2.20+ sys/user does not include asm/ptrace.h + # include + #endif diff --git a/srcpkgs/llvm19/patches/disable-lldb-docs.patch b/srcpkgs/llvm19/patches/disable-lldb-docs.patch new file mode 100644 index 00000000000..6e7c774bea2 --- /dev/null +++ b/srcpkgs/llvm19/patches/disable-lldb-docs.patch @@ -0,0 +1,18 @@ +commit 9af31d021e83dce4e98f06d8e732f4afb481cd08 +Author: Daniel Martinez +Date: Sat Aug 3 18:04:04 2024 -0400 + + disable lldb docs as they depend on some sphinx packages we don't have + +diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt +index 59cdc4593463..e7c2c38b50a9 100644 +--- a/lldb/CMakeLists.txt ++++ b/lldb/CMakeLists.txt +@@ -124,7 +124,6 @@ add_subdirectory(utils/TableGen) + + add_subdirectory(source) + add_subdirectory(tools) +-add_subdirectory(docs) + + if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) diff --git a/srcpkgs/llvm19/patches/flang-cross.patch b/srcpkgs/llvm19/patches/flang-cross.patch new file mode 100644 index 00000000000..7f00e2a1df0 --- /dev/null +++ b/srcpkgs/llvm19/patches/flang-cross.patch @@ -0,0 +1,28 @@ +commit 92984acc52fb95566d9387948c2655507328438b +Author: Daniel Martinez +Date: Wed Jul 31 21:14:52 2024 -0400 + + Allow flang-new binary to be specified for omp modules + + This allows the path of the flang-new binary to be specified as a + cmake configuration. + + This is useful when cross compiling, as flang-new may exist + on the build machine, which should be used instead of the host. + + For example, by passing "-DFLANG_NEW_NATIVE_EXE=/usr/bin/flang-new", + that binary will be used instead of just built host compiler. + +diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt +index 42b1b86ebaad..41921aaeaeb2 100644 +--- a/llvm/runtimes/CMakeLists.txt ++++ b/llvm/runtimes/CMakeLists.txt +@@ -498,7 +498,7 @@ if(build_runtimes) + if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES) + if (${LLVM_TOOL_FLANG_BUILD}) + message(STATUS "Configuring build of omp_lib.mod and omp_lib_kinds.mod via flang-new") +- set(LIBOMP_FORTRAN_MODULES_COMPILER "${CMAKE_BINARY_DIR}/bin/flang-new") ++ set(LIBOMP_FORTRAN_MODULES_COMPILER "${CMAKE_BINARY_DIR}/bin/flang-new" CACHE INTERNAL "") + set(LIBOMP_MODULES_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}/flang") + # TODO: This is a workaround until flang becomes a first-class project + # in llvm/CMakeList.txt. Until then, this line ensures that flang-new is diff --git a/srcpkgs/llvm19/patches/flang-musl-bessel.patch b/srcpkgs/llvm19/patches/flang-musl-bessel.patch new file mode 100644 index 00000000000..59f4e3e2d4b --- /dev/null +++ b/srcpkgs/llvm19/patches/flang-musl-bessel.patch @@ -0,0 +1,69 @@ +commit 8a0c2301664e7178b2c48a8cfb2a10151bdde462 +Author: Daniel Martinez +Date: Wed Jul 31 14:28:29 2024 -0400 + + [flang][runtime] Use fallback bessel functions on musl + + Fixes compilation on linux when using musl as the libc. + + musl does not provide long double variants of the bessel functions. + +diff --git a/flang/runtime/Float128Math/CMakeLists.txt b/flang/runtime/Float128Math/CMakeLists.txt +index a5f5bec1e7e4..b7d890df1f4a 100644 +--- a/flang/runtime/Float128Math/CMakeLists.txt ++++ b/flang/runtime/Float128Math/CMakeLists.txt +@@ -108,6 +108,26 @@ elseif (HAVE_LDBL_MANT_DIG_113) + # We can use 'long double' versions from libc. + check_library_exists(m sinl "" FOUND_LIBM) + if (FOUND_LIBM) ++ check_cxx_source_compiles( ++ "#include ++ int main() { ++ int n = 0; ++ long double x = 1; ++ long double Y0 = y0l(x); ++ long double Y1 = y1l(x); ++ long double Yn = ynl(n,x); ++ long double J0 = j0l(x); ++ long double J1 = j1l(x); ++ long double Jn = jnl(n,x); ++ return 0; ++ } ++ " ++ FOUND_LIBM_BESSEL) ++ if (FOUND_LIBM_BESSEL) ++ target_compile_definitions(FortranFloat128MathILib INTERFACE ++ HAS_LIBM_BESSEL ++ ) ++ endif() + target_compile_definitions(FortranFloat128MathILib INTERFACE + HAS_LIBM + ) +diff --git a/flang/runtime/Float128Math/math-entries.h b/flang/runtime/Float128Math/math-entries.h +index 13fdab264700..45ae40fdafa0 100644 +--- a/flang/runtime/Float128Math/math-entries.h ++++ b/flang/runtime/Float128Math/math-entries.h +@@ -185,9 +185,11 @@ DEFINE_SIMPLE_ALIAS(Hypot, std::hypot) + DEFINE_SIMPLE_ALIAS(Ilogb, std::ilogb) + DEFINE_SIMPLE_ALIAS(Isinf, std::isinf) + DEFINE_SIMPLE_ALIAS(Isnan, std::isnan) ++#ifdef HAS_LIBM_BESSEL + DEFINE_SIMPLE_ALIAS(J0, j0l) + DEFINE_SIMPLE_ALIAS(J1, j1l) + DEFINE_SIMPLE_ALIAS(Jn, jnl) ++#endif + DEFINE_SIMPLE_ALIAS(Ldexp, std::ldexp) + DEFINE_SIMPLE_ALIAS(Lgamma, std::lgamma) + DEFINE_SIMPLE_ALIAS(Llround, std::llround) +@@ -204,9 +206,11 @@ DEFINE_SIMPLE_ALIAS(Tan, std::tan) + DEFINE_SIMPLE_ALIAS(Tanh, std::tanh) + DEFINE_SIMPLE_ALIAS(Tgamma, std::tgamma) + DEFINE_SIMPLE_ALIAS(Trunc, std::trunc) ++#ifdef HAS_LIBM_BESSEL + DEFINE_SIMPLE_ALIAS(Y0, y0l) + DEFINE_SIMPLE_ALIAS(Y1, y1l) + DEFINE_SIMPLE_ALIAS(Yn, ynl) ++#endif + + // Use numeric_limits to produce infinity of the right type. + #define F128_RT_INFINITY \ diff --git a/srcpkgs/llvm19/patches/libcxx-armv67.patch b/srcpkgs/llvm19/patches/libcxx-armv67.patch new file mode 100644 index 00000000000..700ab134790 --- /dev/null +++ b/srcpkgs/llvm19/patches/libcxx-armv67.patch @@ -0,0 +1,35 @@ +See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109180 +Avoid the following undefined reference: + +/usr/lib/gcc/armv7l-linux-gnueabihf/12.2.0/../../../../armv7l-linux-gnueabihf/bin/ld: projects/libcxx/src/CMakeFiles/cxx_shared.dir/locale.cpp.o: in function `std::__1::__time_get_c_storage::__x() const [clone .localalias]': +locale.cpp:(.text._ZNKSt3__120__time_get_c_storageIcE3__xEv+0xb4): undefined reference to `std::__1::basic_string, std::__1::allocator >::~basic_string()' +/usr/lib/gcc/armv7l-linux-gnueabihf/12.2.0/../../../../armv7l-linux-gnueabihf/bin/ld: projects/libcxx/src/CMakeFiles/cxx_shared.dir/locale.cpp.o: in function `std::__1::__time_get_c_storage::__X() const [clone .localalias]': + +diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt +index b8ac536588d3..65e5a1365634 100644 +--- a/libcxx/CMakeLists.txt ++++ b/libcxx/CMakeLists.txt +@@ -308,6 +308,8 @@ endif() + option(LIBCXX_HERMETIC_STATIC_LIBRARY + "Do not export any symbols from the static library." ${LIBCXX_HERMETIC_STATIC_LIBRARY_DEFAULT}) + ++option(LIBCXX_VOID_GCC_BUG_109180_WORKAROUND OFF) ++ + #=============================================================================== + # Check option configurations + #=============================================================================== +diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt +index 35b466527096..5b0efa171616 100644 +--- a/libcxx/src/CMakeLists.txt ++++ b/libcxx/src/CMakeLists.txt +@@ -155,6 +155,10 @@ if (LIBCXX_GENERATE_COVERAGE AND NOT LIBCXX_COVERAGE_LIBRARY) + endif() + add_library_flags_if(LIBCXX_COVERAGE_LIBRARY "${LIBCXX_COVERAGE_LIBRARY}") + ++if (LIBCXX_VOID_GCC_BUG_109180_WORKAROUND) ++ set_source_files_properties(string.cpp PROPERTIES COMPILE_FLAGS -fno-inline) ++endif() ++ + if (APPLE AND LLVM_USE_SANITIZER) + if (("${LLVM_USE_SANITIZER}" STREQUAL "Address") OR + ("${LLVM_USE_SANITIZER}" STREQUAL "Address;Undefined") OR diff --git a/srcpkgs/llvm19/patches/libcxx-musl.patch b/srcpkgs/llvm19/patches/libcxx-musl.patch new file mode 100644 index 00000000000..0dd5f0e7eb8 --- /dev/null +++ b/srcpkgs/llvm19/patches/libcxx-musl.patch @@ -0,0 +1,26 @@ +--- a/libcxx/include/locale ++++ b/libcxx/include/locale +@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end, + __libcpp_remove_reference_t __save_errno = errno; + errno = 0; + char* __p2; ++#if defined(__linux__) && !defined(__GLIBC__) ++ long long __ll = strtoll(__a, &__p2, __base); ++#else + long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); ++#endif + __libcpp_remove_reference_t __current_errno = errno; + if (__current_errno == 0) + errno = __save_errno; +@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end, + __libcpp_remove_reference_t __save_errno = errno; + errno = 0; + char* __p2; ++#if defined(__linux__) && !defined(__GLIBC__) ++ unsigned long long __ll = strtoull(__a, &__p2, __base); ++#else + unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); ++#endif + __libcpp_remove_reference_t __current_errno = errno; + if (__current_errno == 0) + errno = __save_errno; diff --git a/srcpkgs/llvm19/patches/libcxx-ssp-nonshared.patch b/srcpkgs/llvm19/patches/libcxx-ssp-nonshared.patch new file mode 100644 index 00000000000..70292beb2fc --- /dev/null +++ b/srcpkgs/llvm19/patches/libcxx-ssp-nonshared.patch @@ -0,0 +1,11 @@ +--- a/libcxx/CMakeLists.txt ++++ b/libcxx/CMakeLists.txt +@@ -769,6 +769,8 @@ function(cxx_link_system_libraries target) + target_link_libraries(${target} PRIVATE atomic) + endif() + ++#ssp target_link_libraries(${target} PRIVATE ssp_nonshared) ++ + if (MINGW) + target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}") + endif() diff --git a/srcpkgs/llvm19/patches/libcxxabi-dl.patch b/srcpkgs/llvm19/patches/libcxxabi-dl.patch new file mode 100644 index 00000000000..e872d263de3 --- /dev/null +++ b/srcpkgs/llvm19/patches/libcxxabi-dl.patch @@ -0,0 +1,25 @@ +Also link to -ldl to prevent undefined references. + +--- a/libcxxabi/src/CMakeLists.txt ++++ b/libcxxabi/src/CMakeLists.txt +@@ -73,6 +73,7 @@ + endif() + + add_library_flags_if(LIBCXXABI_HAS_C_LIB c) ++ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl) + endif() + + if (LIBCXXABI_USE_LLVM_UNWINDER) +--- a/libcxx/CMakeLists.txt ++++ b/libcxx/CMakeLists.txt +@@ -745,6 +745,10 @@ + if (LIBCXX_HAS_PTHREAD_LIB) + target_compile_definitions(${target} PRIVATE -D_LIBCPP_LINK_PTHREAD_LIB) + endif() ++ if (LIBCXX_HAS_C_LIB) ++ target_link_libraries(${target} PRIVATE dl) ++ endif() ++ + if (LIBCXX_HAS_RT_LIB) + target_compile_definitions(${target} PRIVATE -D_LIBCPP_LINK_RT_LIB) + endif() diff --git a/srcpkgs/llvm19/patches/llvm-001-musl.patch b/srcpkgs/llvm19/patches/llvm-001-musl.patch new file mode 100644 index 00000000000..8652e4af69f --- /dev/null +++ b/srcpkgs/llvm19/patches/llvm-001-musl.patch @@ -0,0 +1,32 @@ +From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:03:02 +0200 +Subject: [PATCH 3/3] musl + +--- + include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ + lib/Support/DynamicLibrary.cpp | 2 +- + lib/Support/Unix/Signals.inc | 6 +++--- + utils/unittest/googletest/src/gtest.cc | 1 + + 5 files changed, 17 insertions(+), 6 deletions(-) + +diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h +index 34a8a1e3..1214ece5 100644 +--- a/llvm/include/llvm/Analysis/TargetLibraryInfo.h ++++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.h +@@ -18,6 +18,15 @@ + #include "llvm/IR/PassManager.h" + #include "llvm/Pass.h" + ++#undef fopen64 ++#undef fseeko64 ++#undef fstat64 ++#undef fstatvfs64 ++#undef ftello64 ++#undef lstat64 ++#undef stat64 ++#undef tmpfile64 ++ + namespace llvm { + template class ArrayRef; + class Triple; diff --git a/srcpkgs/llvm19/patches/llvm-004-override-opt.patch b/srcpkgs/llvm19/patches/llvm-004-override-opt.patch new file mode 100644 index 00000000000..51d0e4b31b3 --- /dev/null +++ b/srcpkgs/llvm19/patches/llvm-004-override-opt.patch @@ -0,0 +1,18 @@ +This allows us to override the optimization level as not all platforms can +deal with -O3. + +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -918,6 +918,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) + llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") + endif() + ++set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use") ++ ++if (NOT VOID_CXX_OPT_FLAGS STREQUAL "") ++ llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}") ++endif() ++ + # Put this before tblgen. Else we have a circular dependence. + add_subdirectory(lib/Demangle) + add_subdirectory(lib/Support) diff --git a/srcpkgs/llvm19/patches/llvm-005-ppc-bigpic.patch b/srcpkgs/llvm19/patches/llvm-005-ppc-bigpic.patch new file mode 100644 index 00000000000..d332687b9d9 --- /dev/null +++ b/srcpkgs/llvm19/patches/llvm-005-ppc-bigpic.patch @@ -0,0 +1,36 @@ +From f3dbdd49c06bfafc1d6138094cf42889c14d38b6 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 3 Nov 2019 10:57:27 -0600 +Subject: [PATCH] [LLVM][PowerPC] Assume BigPIC if no PIC level is specified + +--- + llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 2 +- + llvm/lib/Target/PowerPC/PPCMCInstLower.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp +index cce21f32..87ca5f9b 100644 +--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp ++++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp +@@ -520,7 +520,7 @@ void PPCAsmPrinter::EmitTlsCall(const MachineInstr *MI, + + // Add 32768 offset to the symbol so we follow up the latest GOT/PLT ABI. + if (Kind == MCSymbolRefExpr::VK_PLT && Subtarget->isSecurePlt() && +- M->getPICLevel() == PICLevel::BigPIC) ++ M->getPICLevel() != PICLevel::SmallPIC) + TlsRef = MCBinaryExpr::createAdd( + TlsRef, MCConstantExpr::create(32768, OutContext), OutContext); + const MachineOperand &MO = MI->getOperand(2); +diff --git a/lib/Target/PowerPC/PPCMCInstLower.cpp b/lib/Target/PowerPC/PPCMCInstLower.cpp +index 5cc180d7..a5b02565 100644 +--- a/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp ++++ b/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp +@@ -117,7 +117,7 @@ static MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol, + const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, RefKind, Ctx); + // If -msecure-plt -fPIC, add 32768 to symbol. + if (Subtarget->isSecurePlt() && TM.isPositionIndependent() && +- M->getPICLevel() == PICLevel::BigPIC && ++ M->getPICLevel() != PICLevel::SmallPIC && + MO.getTargetFlags() == PPCII::MO_PLT) + Expr = + MCBinaryExpr::createAdd(Expr, MCConstantExpr::create(32768, Ctx), Ctx); diff --git a/srcpkgs/llvm19/patches/llvm-006-aarch64-mf_exec.patch b/srcpkgs/llvm19/patches/llvm-006-aarch64-mf_exec.patch new file mode 100644 index 00000000000..192b4824b86 --- /dev/null +++ b/srcpkgs/llvm19/patches/llvm-006-aarch64-mf_exec.patch @@ -0,0 +1,24 @@ +Fix failures in AllocationTests/MappedMemoryTest.* on aarch64: + + Failing Tests (8): + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3 + +Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10 + +--- a/llvm/lib/Support/Unix/Memory.inc ++++ b/llvm/lib/Support/Unix/Memory.inc +@@ -58,7 +58,7 @@ static int getPosixProtectionFlags(unsigned Flags) { + return PROT_READ | PROT_WRITE | PROT_EXEC; + case llvm::sys::Memory::MF_EXEC: +-#if defined(__FreeBSD__) || defined(__powerpc__) ++#if defined(__FreeBSD__) || defined(__powerpc__) || (defined(__linux__) && defined(__aarch64__)) + // On PowerPC, having an executable page that has no read permission + // can have unintended consequences. The function InvalidateInstruction- + // Cache uses instructions dcbf and icbi, both of which are treated by diff --git a/srcpkgs/llvm19/template b/srcpkgs/llvm19/template new file mode 100644 index 00000000000..c140037362e --- /dev/null +++ b/srcpkgs/llvm19/template @@ -0,0 +1,1109 @@ +# Template file for 'llvm19' +pkgname=llvm19 +version=19.1.3 +revision=3 +build_wrksrc=llvm +build_style=cmake +_llvm_prefix=lib/llvm/19 +_llvm_mandir=usr/${_llvm_prefix}/share/man +_llvm_bindir=usr/${_llvm_prefix}/bin +_llvm_datadir=usr/${_llvm_prefix}/share +_llvm_incdir=usr/${_llvm_prefix}/include +_llvm_libdir=usr/${_llvm_prefix}/lib +_llvm_libexecdir=usr/${_llvm_prefix}/libexec +_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" +configure_args=" + -DCMAKE_BUILD_TYPE=Release -Wno-dev + -DCMAKE_INSTALL_PREFIX=/usr/${_llvm_prefix} + -DENABLE_LINKER_BUILD_ID=YES + -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES + -DLIBCXXABI_USE_COMPILER_RT=YES + -DLIBCXXABI_USE_LLVM_UNWINDER=YES + -DLIBCXX_CXX_ABI=libcxxabi + -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES + -DLIBCXX_USE_COMPILER_RT=YES + -DLIBOMP_ENABLE_SHARED=YES + -DLIBOMP_INSTALL_ALIASES=NO + -DOPENMP_INSTALL_LIBDIR=lib + -DOFFLOAD_INSTALL_LIBDIR=lib + -DLLVM_BUILD_DOCS=YES + -DLLVM_INCLUDE_DOCS=YES + -DLLVM_ENABLE_SPHINX=YES + -DLLVM_ENABLE_Z3_SOLVER=YES + -DSPHINX_WARNINGS_AS_ERRORS=NO + -DLLVM_INSTALL_UTILS=YES + -DLLVM_BUILD_LLVM_DYLIB=YES + -DLLVM_LINK_LLVM_DYLIB=YES + -DCLANG_LINK_CLANG_DYLIB=YES + -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang19 + -DLLVM_ENABLE_RTTI=YES + -DLLVM_ENABLE_FFI=YES + -DLLVM_BINUTILS_INCDIR=/usr/include + -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages + -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver} + -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix + -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO + -DLLVM_SPIRV=/usr/bin/llvm-spirv +" +hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx + python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config + python3-mdit-py-plugins python3-MyST-Parser python3-markdown-it + patchelf $(vopt_if graphviz graphviz)" +makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel + libxml2-devel binutils-devel z3-devel" +short_desc="LLVM Compiler Infrastructure Project - Version 19" +maintainer="Daniel Martinez " +license="Apache-2.0 AND NCSA AND custom:Apache-2.0-with-llvm-exception" +homepage="https://www.llvm.org" +distfiles="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${version}.tar.gz" +checksum=e5106e2bef341b3f5e41340e4b6c6a58259f4021ad801acf14e88f1a84567b05 +conflicts="llvm18>=0 llvm17>=0 llvm15>=0" +lib32disabled=yes +python_version=3 + +build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt + openmp libc libcxx libunwind offload lto graphviz full_debug" +build_options_default="clang clang_tools_extra lld libclc polly lldb + libcxx libunwind mlir" + +# fails to build with libquadmth on musl +case "$XBPS_TARGET_MACHINE" in + x86_64|i686) makedepends+=" libquadmath-devel" ;; +esac + +case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*|riscv64*) + build_options_default+=" bolt flang" + if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" offload" + fi + ;; + armv*) + nopie=yes + configure_args+=" -DLLVM_ENABLE_PIE=NO" + configure_args+=" -DLLDB_INCLUDE_TESTS=NO" + ;; +esac + +if [ -z "$CROSS_BUILD" ]; then + hostmakedepends+=" llvm19-bootstrap" + + # Needs lld on the target machine + configure_args+=" -DLLVM_USE_LINKER=lld" +fi + +# build fails because compiler_rt generates armv7 instructions when target is armv6 +case "$XBPS_TARGET_MACHINE" in + armv6*) + # Don't enable openmp on armv6* + #/builddir/llvm19-19.1.0/openmp/runtime/src/kmp_platform.h:263:2: + #error Unknown or unsupported architecture + ;; + *) + build_options_default+=" openmp " + configure_args+=" -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + ;; +esac + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + _is_musl="YES" + configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES + -DCOMPILER_RT_BUILD_GWP_ASAN=OFF" +else + _is_musl="NO" +fi + +if [ "$build_option_lto" ]; then + configure_args+=" -DLLVM_ENABLE_LTO=On" +fi + +subpackages=" + libllvm19 llvm19-doc llvm19-devel compiler-rt19 + $( vopt_if clang 'clang19 clang19-headers clang19-devel libclang19 libclang-cpp19 clang-analyzer19' ) + $( vopt_if clang_tools_extra 'clang-tools-extra19' ) + $( vopt_if bolt 'llvm-bolt19' ) + $( vopt_if lldb 'lldb19 lldb19-devel liblldb19' ) + $( vopt_if lld 'lld19 lld19-devel' ) + $( vopt_if libclc 'libclc19' ) + $( vopt_if mlir 'mlir19 mlir19-devel' ) + $( vopt_if flang 'flang19 flang19-devel' ) + $( vopt_if openmp 'libomp19 libomp19-devel' ) + $( vopt_if libunwind 'llvm-libunwind llvm-libunwind-devel' ) + $( vopt_if libcxx 'libcxx libcxxabi libcxxabi-devel libcxx-devel' ) +" + +_enabled_projects="$(vopt_if clang 'clang;')\ +$(vopt_if clang_tools_extra 'clang-tools-extra;')\ +$(vopt_if bolt 'bolt;')\ +$(vopt_if polly 'polly;')\ +$(vopt_if lldb 'lldb;')\ +$(vopt_if lld 'lld;')\ +$(vopt_if libclc 'libclc;')\ +$(vopt_if mlir 'mlir;')\ +$(vopt_if flang 'flang;')" + +_enabled_runtimes="compiler-rt\ +$(vopt_if openmp ';openmp')\ +$(vopt_if offload ';offload')\ +$(vopt_if libc ';libc')\ +$(vopt_if libunwind ';libunwind')\ +$(vopt_if libcxx ';libcxxabi;libcxx')" + +configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}" +configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}" + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" llvm19-cross-tools SPIRV-LLVM-Translator19" + + configure_args+=" -DLLVM_TOOLS_BINAIRY_DIR=/${_llvm_bindir}" + configure_args+=" -DLLVM_NATIVE_TOOL_DIR=/${_llvm_bindir}" + configure_args+=" -DLLVM_TABLEGEN=/${_llvm_bindir}/llvm-tblgen" + configure_args+=" -DCLANG_TABLEGEN=/${_llvm_bindir}/clang-tblgen" + configure_args+=" -DMLIR_TABLEGEN=/${_llvm_bindir}/mlir-tblgen" + configure_args+=" -DMLIR_PDLL_TABLEGEN=/${_llvm_bindir}/mlir-pdll" + configure_args+=" -DMLIR_LINALG_ODS_YAML_GEN=/${_llvm_bindir}/mlir-linalg-ods-yaml-gen" + configure_args+=" -DMLIR_CONFIG_SRC_SHARDER_TABLEGEN_EXE=/${_llvm_bindir}/mlir-src-sharder" + configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=/${_llvm_bindir}/clang-tidy-confusable-chars-gen" + configure_args+=" -DCLANG_PSEUDO_GEN=/${_llvm_bindir}/clang-pseudo-gen" + configure_args+=" -DLLVM_CONFIG_PATH=/${_llvm_bindir}/llvm-config" + configure_args+=" -DLLDB_TABLEGEN_EXE=/${_llvm_bindir}/lldb-tblgen" + + configure_args+=" -DLIBOMP_OMPD_GDB_SUPPORT=NO" + + if [ "$build_option_flang" ]; then + configure_args+=" -DLIBOMP_FORTRAN_MODULES_COMPILER=/${_llvm_bindir}/flang-new" + fi +fi + +# For OCaml bindings and lldb lua scripting +if [ -z "$CROSS_BUILD" ]; then + subpackages="llvm19-cross-tools ${subpackages}" + # OCaml cross build is broken + hostmakedepends+=" ocaml ocaml-findlib" + # lldb cross build fails with lua + makedepends+=" lua53-devel " +fi + +case "$XBPS_TARGET_MACHINE" in +arm*-musl|i686-musl) + # sanitizer code is broken since it duplicates some libc bits + configure_args+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF" + configure_args+=" -DCOMPILER_RT_BUILD_XRAY=OFF" + configure_args+=" -DCOMPILER_RT_BUILD_MEMPROF=OFF" + ;; +esac + +case "$XBPS_TARGET_MACHINE" in + i686*) _arch="X86";; + x86_64*) _arch="X86";; + armv5*) _arch="Armv5te";; + armv6*) _arch="Armv6";; + armv7*) _arch="Armv7";; + aarch64*) _arch="AArch64";; + mips*) _arch="Mips";; + ppc*) _arch="PowerPC";; + riscv64*) _arch="RISCV64";; +esac + +_triplet=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET} + +configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" +configure_args+=" -DLLVM_HOST_TRIPLE=${_triplet}" +configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${_triplet}" + +_vlink_libs() { + local _files="$1" + local _f + for _f in $DESTDIR/$_files; do + local _base=$(basename "${_f}") + echo "ln -s /${_llvm_libdir}/${_base} ${DESTDIR}/usr/lib" + ln -s /${_llvm_libdir}/${_base} ${DESTDIR}/usr/lib + vmove ${_llvm_libdir}/${_base} + vmove usr/lib/${_base} + done +} + +post_patch() { + # need libssp_nonshared on some musl platforms (because of nodefaultlibs) + case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*-musl|i686-musl|mips*-musl) + vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ + ${wrksrc}/libunwind/src/CMakeLists.txt + vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ + ${wrksrc}/libcxxabi/src/CMakeLists.txt + vsed -i 's,#ssp,,' ${wrksrc}/libcxx/CMakeLists.txt + ;; + esac +} + +_setup_cross_cflags() { + CC="clang" + CXX="clang++" + + CFLAGS+=" -Wno-gnu-include-next -Wno-unused-command-line-argument" + CXXFLAGS+=" -Wno-gnu-include-next -Wno-unused-command-line-argument" + + local gcc_version=$(gcc -dumpversion) + + CFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE}" + CFLAGS+=" --gcc-toolchain=/usr" + CFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include" + + CXXFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE}" + CXXFLAGS+=" --gcc-toolchain=/usr" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward" + CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include" +} + +_setup_debug() { + if [ ! "$build_option_full_debug" ]; then + # Vastly reduce size of debugging symbols: + CFLAGS=${CFLAGS/ -g/ -gline-tables-only} + CXXFLAGS=${CXXFLAGS/ -g/ -gline-tables-only} + fi +} + +pre_configure() { + CC="clang" + CXX="clang++" + if [ "$CROSS_BUILD" ]; then + _setup_cross_cflags + fi + + _setup_debug +} + +pre_build() { + _setup_debug +} + +post_build() { + + if [ "$CROSS_BUILD" ]; then + CC="clang" + CXX="clang++" + + CFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE} " + CFLAGS+=" --gcc-toolchain=/usr" + CFLAGS+=" -L/${_llvm_libdir}/${XBPS_CROSS_TRIPLET} " + + CXXFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE} " + CXXFLAGS+=" --gcc-toolchain=/usr" + CXXFLAGS+=" -L/${_llvm_libdir}/${XBPS_CROSS_TRIPLET} " + else + export CC=${wrksrc}/llvm/build/bin/clang + export CXX=${wrksrc}/llvm/build/bin/clang++ + fi + + mkdir -p ${wrksrc}/${build_wrksrc}/builddir_runtimes + cmake -G Ninja ${wrksrc}/runtimes -B ${wrksrc}/${build_wrksrc}/builddir_runtimes \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_ASM_COMPILER_TARGET=${_triplet} \ + -DCMAKE_C_COMPILER=$CC \ + -DCMAKE_C_COMPILER_TARGET=${_triplet} \ + -DCMAKE_CXX_COMPILER=$CXX \ + -DCMAKE_CXX_COMPILER_TARGET=${_triplet} \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ + -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES \ + -DLIBCXXABI_USE_COMPILER_RT=YES \ + -DLIBCXXABI_USE_LLVM_UNWINDER=YES \ + -DLIBCXX_CXX_ABI=libcxxabi \ + -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES \ + -DLIBCXX_USE_COMPILER_RT=YES \ + -DLLVM_ENABLE_SPHINX=ON \ + -DLLVM_TARGET_ARCH=${_arch} \ + -DLLVM_HOST_TRIPLE=${_triplet} \ + -DLLVM_DEFAULT_TARGET_TRIPLE=${_triplet} \ + -DLIBCXX_HAS_MUSL_LIBC=${_is_musl} \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF + + ninja ${makejobs} -C ${wrksrc}/${build_wrksrc}/builddir_runtimes + ninja ${makejobs} -C ${wrksrc}/${build_wrksrc}/builddir_runtimes docs-libcxx-html docs-libunwind-html +} + +post_install() { + + # Required for multilib. + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + for _header in llvm-config; do + mv ${DESTDIR}/${_llvm_incdir}/llvm/Config/${_header}{,-64}.h + vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \ + ${_llvm_incdir}/llvm/Config ${_header}.h + done + fi + + # Remove llvm-config-host in cross builds. + if [ "$CROSS_BUILD" ]; then + rm -f ${DESTDIR}/${_llvm_bindir}/llvm-config-host + fi + + rm -rf ${DESTDIR}/usr/share/gdb + + if [ "$build_option_libcxx" ]; then + + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr \ + -P ${wrksrc}/${build_wrksrc}/builddir_runtimes/libcxx/docs/cmake_install.cmake + + LIBCXX_DOCS=${_llvm_datadir}/doc/LLVM/libcxx + vmkdir ${LIBCXX_DOCS} + vcopy ${wrksrc}/${build_wrksrc}/builddir_runtimes/libcxx/docs/html ${LIBCXX_DOCS} + fi + + if [ "$build_option_libunwind" ]; then + + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr \ + -P ${wrksrc}/${build_wrksrc}/builddir_runtimes/libunwind/docs/cmake_install.cmake + + LIBUNWIND_DOCS=${_llvm_datadir}/doc/LLVM/libunwind + vmkdir ${LIBUNWIND_DOCS} + vcopy ${wrksrc}/${build_wrksrc}/builddir_runtimes/libunwind/docs/html ${LIBUNWIND_DOCS} + fi + + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr \ + -P ${wrksrc}/${build_wrksrc}/builddir_runtimes/cmake_install.cmake + + # Can this be disabled some other way? + rm -f ${DESTDIR}/usr/lib64 + + vmkdir usr/lib/clang + ln -s ../llvm/19/lib/clang/19 ${DESTDIR}/usr/lib/clang/19 +} + +_llvm_alts=( + bin/FileCheck share/man/man1/FileCheck.1 + bin/UnicodeNameMappingGenerator + bin/bugpoint share/man/man1/bugpoint.1 + bin/clang-installapi + bin/clang-nvlink-wrapper + bin/count + bin/dsymutil share/man/man1/dsymutil.1 + bin/intercept-build + bin/llc + bin/lli + bin/lli-child-target + bin/llvm-PerfectShuffle + bin/llvm-addr2line + bin/llvm-ar + bin/llvm-as + bin/llvm-bcanalyzer + bin/llvm-bitcode-strip + bin/llvm-c-test + bin/llvm-cat + bin/llvm-cfi-verify + bin/llvm-cgdata + bin/llvm-config + bin/llvm-cov + bin/llvm-cvtres + bin/llvm-cxxdump + bin/llvm-cxxfilt + bin/llvm-cxxmap + bin/llvm-debuginfo-analyzer + bin/llvm-debuginfod + bin/llvm-debuginfod-find + bin/llvm-diff + bin/llvm-dis + bin/llvm-dlltool + bin/llvm-dwarfdump + bin/llvm-dwarfutil + bin/llvm-dwp + bin/llvm-exegesis + bin/llvm-extract + bin/llvm-gsymutil + bin/llvm-ifs + bin/llvm-install-name-tool + bin/llvm-jitlink + bin/llvm-jitlink-executor + bin/llvm-lib + bin/llvm-libtool-darwin + bin/llvm-link + bin/llvm-lipo + bin/llvm-lto + bin/llvm-lto2 + bin/llvm-mc + bin/llvm-mca + bin/llvm-ml + bin/llvm-modextract + bin/llvm-mt + bin/llvm-nm + bin/llvm-objcopy + bin/llvm-objdump + bin/llvm-opt-report share/man/man1/llvm-opt-report.1 + bin/llvm-otool + bin/llvm-pdbutil + bin/llvm-profdata share/man/man1/llvm-profdata.1 + bin/llvm-profgen share/man/man1/llvm-profgen.1 + bin/llvm-ranlib share/man/man1/llvm-ranlib.1 + bin/llvm-rc + bin/llvm-readelf share/man/man1/llvm-readelf.1 + bin/llvm-readobj share/man/man1/llvm-readobj.1 + bin/llvm-readtapi + bin/llvm-reduce share/man/man1/llvm-reduce.1 + bin/llvm-remarkutil share/man/man1/llvm-remarkutil.1 + bin/llvm-rtdyld + bin/llvm-sim + bin/llvm-size share/man/man1/llvm-size.1 + bin/llvm-split + bin/llvm-stress share/man/man1/llvm-stress.1 + bin/llvm-strings share/man/man1/llvm-strings.1 + bin/llvm-strip share/man/man1/llvm-strip.1 + bin/llvm-symbolizer share/man/man1/llvm-symbolizer.1 + bin/llvm-tblgen share/man/man1/llvm-tblgen.1 + bin/llvm-tli-checker share/man/man1/llvm-tli-checker.1 + bin/llvm-undname + bin/llvm-windres + bin/llvm-xray + bin/not + bin/obj2yaml + bin/opt share/man/man1/opt.1 + bin/prepare_builtins + bin/reduce-chunk-list + bin/sancov + bin/sanstats + bin/split-file + bin/tblgen-to-irdl + bin/verify-uselistorder + bin/yaml-bench + bin/yaml2obj + share/man/man1/lit.1 + share/man/man1/llc.1 + share/man/man1/lldb-tblgen.1 + share/man/man1/lli.1 + share/man/man1/llvm-addr2line.1 + share/man/man1/llvm-ar.1 + share/man/man1/llvm-as.1 + share/man/man1/llvm-bcanalyzer.1 + share/man/man1/llvm-config.1 + share/man/man1/llvm-cov.1 + share/man/man1/llvm-cxxfilt.1 + share/man/man1/llvm-cxxmap.1 + share/man/man1/llvm-debuginfo-analyzer.1 + share/man/man1/llvm-diff.1 + share/man/man1/llvm-dis.1 + share/man/man1/llvm-dwarfdump.1 + share/man/man1/llvm-dwarfutil.1 + share/man/man1/llvm-exegesis.1 + share/man/man1/llvm-extract.1 + share/man/man1/llvm-ifs.1 + share/man/man1/llvm-install-name-tool.1 + share/man/man1/llvm-lib.1 + share/man/man1/llvm-libtool-darwin.1 + share/man/man1/llvm-link.1 + share/man/man1/llvm-lipo.1 + share/man/man1/llvm-locstats.1 + share/man/man1/llvm-mc.1 + share/man/man1/llvm-mca.1 + share/man/man1/llvm-nm.1 + share/man/man1/llvm-objcopy.1 + share/man/man1/llvm-objdump.1 + share/man/man1/llvm-otool.1 + share/man/man1/llvm-pdbutil.1 + share/man/man1/tblgen.1 +) + +alternatives=$(:) +for _alt in "${_llvm_alts[@]}"; do + alternatives+=" llvm:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" +done + +clang19_package() { + lib32disabled=yes + depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel + compiler-rt19>=${version}_${revision}" + conflicts="clang18>=0 clang17>=0 clang15>=0" + short_desc+=" - C language family frontend" + homepage="https://clang.llvm.org/" + _clang19_files=( + bin/clang-19 + bin/clang + bin/clang++ + bin/clang-cl + bin/clang-cpp + bin/clang-check + bin/clang-extdef-mapping + bin/clang-format + bin/git-clang-format + bin/clang-linker-wrapper + bin/clang-offload-bundler + bin/clang-offload-packager + bin/clang-refactor + bin/clang-rename + bin/clang-repl + bin/clang-scan-deps + bin/clang-tblgen + bin/c-index-test + bin/diagtool + bin/amdgpu-arch + bin/nvptx-arch + bin/hmaptool + lib/LLVMgold.so + share/man/man1/clang.1 + share/man/man1/diagtool.1 + share/man/man1/clang-tblgen.1 + ) + + for _alt in "${_clang19_files[@]}"; do + alternatives+=" clang:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + + if [ "$build_option_polly" ]; then + alternatives+=" + clang:/usr/lib/LLVMPolly.so:/${_llvm_libdir}/LLVMPolly.so + clang:/usr/share/man/man1/polly.1:/${_llvm_mandir}/man1/polly1.1 + " + fi + pkg_install() { + vlicense ${wrksrc}/clang/LICENSE.TXT + for _bin in "${_clang19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_bin} + done + + if [ "$build_option_polly" ]; then + vmove ${_llvm_libdir}/LLVMPolly.so + vmove ${_llvm_mandir}/man1/polly.1 + fi + } +} + +clang19-headers_package() { + lib32disabled=yes + short_desc+=" - C language family frontend - Headers" + homepage="https://clang.llvm.org/" + pkg_install() { + vmove ${_llvm_libdir}/clang/19/include + vmove ${_llvm_incdir}/c++ + vmove ${_llvm_datadir}/libc++ + vmove usr/lib/clang + } +} + +clang19-devel_package() { + lib32disabled=yes + depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel + clang19>=${version}_${revision} clang-analyzer19>=${version}_${revision} + llvm19>=${version}_${revision}" + conflicts="clang18-devel clang17-devel clang15-devel" + if [ "$build_option_clang_tools_extra" ]; then + depends+=" clang-tools-extra19>=${version}_${revision}" + fi + short_desc+=" - C language family frontend - development Files" + homepage="https://clang.llvm.org/" + pkg_install() { + vmove ${_llvm_incdir}/clang + vmove ${_llvm_incdir}/clang-c + vmove ${_llvm_libdir}/libear + vmove ${_llvm_libdir}/cmake/clang + vmove "${_llvm_libdir}/libclang*.a" + vmove "${_llvm_libdir}/libclang*.so" + vmove ${_llvm_datadir}/clang + if [ "$build_option_clang_tools_extra" ]; then + vmove ${_llvm_incdir}/clang-tidy + vmove ${_llvm_libdir}/libfindAllSymbols.a + fi + if [ "$build_option_polly" ]; then + vmove ${_llvm_incdir}/polly + vmove ${_llvm_libdir}/cmake/polly + vmove "${_llvm_libdir}/libPolly*.a" + fi + } +} + +libclang19_package() { + depends="clang19-headers>=${version}_${revision}" + short_desc+=" - C frontend library" + pkg_install() { + _vlink_libs "${_llvm_libdir}/libclang.so.*" + } +} + +libclang-cpp19_package() { + depends="clang19-headers>=${version}_${revision}" + short_desc+=" - C frontend library (C++ interface)" + pkg_install() { + _vlink_libs "${_llvm_libdir}/libclang-cpp.so.*" + } +} + +clang-analyzer19_package() { + depends="clang19>=${version}_${revision} python3 perl" + conflicts="clang-analyzer18>=0 clang-analyzer17>=0 clang-analyzer15>=0" + short_desc+=" - A source code analysis framework" + homepage="https://clang-analyzer.llvm.org/" + pycompile_dirs="${_llvm_datadir}/scan-view" + _clang_analyzer19_files=( + share/scan-view + share/scan-build + lib/libscanbuild + libexec/analyze-c++ + libexec/analyze-cc + libexec/intercept-c++ + libexec/intercept-cc + libexec/c++-analyzer + libexec/ccc-analyzer + share/man/man1/scan-build.1 + bin/analyze-build + bin/scan-build + bin/scan-build-py + bin/scan-view + ) + for _alt in "${_clang_analyzer19_files[@]}"; do + alternatives+=" clang-analyzer:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + for _f in "${_clang_analyzer19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + } +} + +clang-tools-extra19_package() { + lib32disabled=yes + depends="clang19>=${version}_${revision} python3" + conflicts="clang-tools-extra18>=0 clang-tools-extra17>=0 clang-tools-extra15>=0" + short_desc+=" - Extra Clang tools" + homepage="https://clang.llvm.org/extra/" + _clang_tools_extra19_files=( + bin/clang-apply-replacements + bin/clang-change-namespace + bin/clang-doc + bin/clang-include-cleaner + bin/clang-include-fixer + bin/clang-move + bin/clang-pseudo + bin/clang-query + bin/clang-reorder-fields + bin/clang-tidy + bin/clangd + bin/find-all-symbols + bin/modularize + bin/pp-trace + bin/run-clang-tidy + share/man/man1/extraclangtools.1 + ) + + for _alt in "${_clang_tools_extra19_files[@]}"; do + alternatives+=" clang-tools-extra:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + vlicense ${wrksrc}/clang-tools-extra/LICENSE.TXT + for _f in "${_clang_tools_extra19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + } +} + +# "bolt" package name is already used +llvm-bolt19_package() { + lib32disabled=yes + depends="clang19>=${version}_${revision}" + conflicts="llvm-bolt18>=0 llvm-bolt17>=0" + short_desc+=" - post-link optimizer" + homepage="https://github.com/llvm/llvm-project/tree/main/bolt" + _llvm_bolt19_files=( + bin/llvm-bolt + bin/perf2bolt + bin/llvm-boltdiff + bin/merge-fdata + bin/llvm-bolt-heatmap + ) + for _alt in "${_llvm_bolt19_files[@]}"; do + alternatives+=" llvm-bolt:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + vlicense ${wrksrc}/bolt/LICENSE.TXT + for _f in "${_llvm_bolt19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + if [ -z "$CROSS_BUILD" ]; then + vmove ${_llvm_libdir}/libbolt_rt_instr.a + vmove ${_llvm_libdir}/libbolt_rt_hugify.a + fi + } +} + +lldb19_package() { + lib32disabled=yes + depends+=" python3-six" + conflicts="lldb18>=0 lldb17>=0 lldb15>=0" + short_desc+=" - LLDB debugger" + homepage="https://lldb.llvm.org/" + _lldb19_files=( + bin/lldb + bin/lldb-argdumper + bin/lldb-instr + bin/lldb-server + bin/lldb-dap + lib/python${py3_ver}/site-packages/lldb + ) + if [ -z "$CROSS_BUILD" ]; then + _lldb19_files+=("lib/lua/5.3/lldb.so") + fi + for _alt in "${_lldb19_files[@]}"; do + alternatives+=" lldb:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + vlicense ${wrksrc}/lldb/LICENSE.TXT + for _f in "${_lldb19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + } +} + +lldb19-devel_package() { + lib32disabled=yes + depends="lldb19>=${version}_${revision}" + conflicts="lldb18-devel>=0 lldb17-devel>=0 lldb15-devel>=0" + short_desc+=" - LLDB debugger - development files" + pkg_install() { + vmove ${_llvm_incdir}/lldb + vmove "${_llvm_libdir}/liblldb*.so" + } +} + +liblldb19_package() { + lib32disabled=yes + short_desc+=" - LLDB debugger - runtime library" + pkg_install() { + _vlink_libs "${_llvm_libdir}/liblldb*.so.*" + } +} + +lld19_package() { + lib32disabled=yes + conflicts="lld18>=0 lld17>=0 lld15>=0" + short_desc+=" - linker" + homepage="https://lld.llvm.org" + _lld19_files=( + bin/lld + bin/lld-link + bin/ld.lld + bin/ld64.lld + bin/wasm-ld + ) + for _alt in "${_lld19_files[@]}"; do + alternatives+=" lld:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + vlicense ${wrksrc}/lld/LICENSE.TXT + for _f in "${_lld19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + } +} + +lld19-devel_package() { + lib32disabled=yes + depends="lld19>=${version}_${revision} llvm19>=${version}_${revision}" + conflicts="lld18-devel>=0 lld17-devel>=0 lld15-devel>=0" + short_desc+=" - linker - development files" + homepage="https://lld.llvm.org" + pkg_install() { + vmove ${_llvm_incdir}/lld + vmove ${_llvm_libdir}/cmake/lld + vmove "${_llvm_libdir}/liblld*.a" + } +} + +mlir19_package() { + lib32disabled=yes + short_desc+=" - multi-level IR compiler framework" + homepage="https://mlir.llvm.org/" + _mlir19_files=( + bin/mlir-cat + bin/mlir-cpu-runner + bin/mlir-linalg-ods-yaml-gen + bin/mlir-lsp-server + bin/mlir-minimal-opt + bin/mlir-minimal-opt-canonicalize + bin/mlir-opt + bin/mlir-pdll + bin/mlir-pdll-lsp-server + bin/mlir-query + bin/mlir-reduce + bin/mlir-tblgen + bin/mlir-transform-opt + bin/mlir-translate + bin/tblgen-lsp-server + share/man/man1/mlir-tblgen.1 + ) + for _alt in "${_mlir19_files[@]}"; do + alternatives+=" mlir:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + for _f in "${_mlir19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + _vlink_libs "${_llvm_libdir}/libMLIR*.so.*" + _vlink_libs "${_llvm_libdir}/libmlir*.so.*" + } +} + +mlir19-devel_package() { + lib32disabled=yes + depends="mlir19>=${version}_${revision} llvm19>=${version}_${revision}" + conflicts="mlir18-devel>=0 mlir17-devel>=0" + short_desc+=" - multi-level IR compiler framework - development files" + homepage="https://mlir.llvm.org/" + pkg_install() { + vmove ${_llvm_incdir}/mlir + vmove ${_llvm_incdir}/mlir-c + vmove ${_llvm_libdir}/cmake/mlir + vmove "${_llvm_libdir}/libMLIR*" + vmove "${_llvm_libdir}/objects-Release/obj.MLIR*" + vmove "${_llvm_libdir}/libmlir*" + } +} + +flang19_package() { + lib32disabled=yes + depends="mlir19>=${version}_${revision}" + conflicts="flang18>=0 flang17>=0" + short_desc+=" - Fortran language frontend" + homepage="https://flang.llvm.org/" + _flang19_files=( + bin/flang-new + bin/bbc + bin/f18-parse-demo + bin/fir-opt + bin/tco + ) + for _alt in "${_flang19_files[@]}"; do + alternatives+=" flang:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + for _f in "${_flang19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + vmove "${_llvm_libdir}/libflang*.a" + vmove "${_llvm_libdir}/libFortran*.a" + vmove "${_llvm_incdir}/flang/*.mod" + } +} + +flang19-devel_package() { + lib32disabled=yes + depends="flang19>=${version}_${revision} llvm19>=${version}_${revision}" + conflicts="flang18-devel>=0 flang17-devel>=0" + short_desc+=" - Fortran language frontend - development files" + homepage="https://flang.llvm.org/" + pkg_install() { + vmove ${_llvm_incdir}/flang + vmove ${_llvm_libdir}/cmake/flang + vmove "${_llvm_libdir}/libFIR*.a" + vmove "${_llvm_libdir}/libHLFIR*.a" + vmove "${_llvm_libdir}/libCUF*.a" + } +} + +libomp19_package() { + short_desc+=" - Clang OpenMP support library" + conflicts="libomp18>=0 libomp17>=0" + _libomp19_files=( + lib/libomp.so + ) + case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*|riscv64*) + _libomp19_files+=("lib/libompd.so") + ;; + esac + if [ "$build_option_offload" ]; then + _libomp19_files+=("bin/llvm-omp-device-info") + _libomp19_files+=("bin/llvm-omp-kernel-replay") + _libomp19_files+=("lib/libomptarget.so") + fi + for _alt in "${_libomp19_files[@]}"; do + alternatives+=" libomp:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + for _f in "${_libomp19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + if [ "$build_option_offload" ]; then + _vlink_libs "${_llvm_libdir}/libomp*.so*" + fi + } +} + +libomp19-devel_package() { + short_desc+=" - Clang OpenMP support library - development files" + depends="libomp19>=${version}_${revision}" + conflicts="libomp18-devel>=0 libomp17-devel>=0" + pkg_install() { + if [ -f "${DESTDIR}/${_llvm_libdir}/libarcher.so" ]; then + vmove "${_llvm_libdir}/libarcher*.so" + fi + if [ -f "${DESTDIR}/${_llvm_libdir}/libarcher_static.a" ]; then + vmove "${_llvm_libdir}/libarcher*.a" + fi + + vmove ${_llvm_libdir}/cmake/openmp + + if [ "$build_option_offload" ]; then + vmove "${_llvm_libdir}/libomptarget*.bc" + vmove "${_llvm_libdir}/libomp*.a" + fi + } +} + +llvm-libunwind_package() { + short_desc+=" - libunwind" + pkg_install() { + vmove "usr/lib/libunwind.so.*" + } +} + +llvm-libunwind-devel_package() { + short_desc+=" - libunwind - development files" + depends="llvm-libunwind>=${version}_${revision}" + conflicts="libunwind-devel>=0" + pkg_install() { + vmove usr/include/mach-o + vmove "usr/include/*unwind*" + vmove "usr/lib/libunwind.a" + vmove "usr/lib/libunwind.so" + } +} + +libcxxabi_package() { + short_desc+=" - low level support for libc++" + pkg_install() { + vmove "usr/lib/libc++abi.so.*" + } +} + +libcxxabi-devel_package() { + short_desc+=" - low level support for libc++ - development files" + depends="libcxxabi>=${version}_${revision}" + pkg_install() { + vmove usr/include/c++/v1/cxxabi.h + vmove usr/include/c++/v1/__cxxabi_config.h + vmove usr/lib/libc++abi.so + vmove usr/lib/libc++abi.a + } +} + +libcxx_package() { + short_desc+=" - C++ standard library" + pkg_install() { + vmove "usr/lib/libc++.so.*" + } +} + +libcxx-devel_package() { + short_desc+=" - C++ standard library - development files" + depends="libcxx>=${version}_${revision}" + pkg_install() { + vmove usr/lib/libc++.modules.json + vmove usr/include/c++ + vmove usr/share/libc++ + vmove "usr/lib/libc++.so" + vmove "usr/lib/libc++.a" + vmove "usr/lib/libc++experimental.a" + } +} + +compiler-rt19_package() { + short_desc+=" - runtime libraries" + depends="clang19-headers>=${version}_${revision}" + noshlibprovides=yes + noverifyrdeps=yes + homepage="https://compiler-rt.llvm.org/" + pkg_install() { + vmove ${_llvm_libdir}/clang/19/lib + if [ -d "${DESTDIR}/${_llvm_libdir}/clang/19/bin" ]; then + vmove ${_llvm_libdir}/clang/19/bin + fi + if [ -d "${DESTDIR}/${_llvm_libdir}/clang/19/share" ]; then + vmove ${_llvm_libdir}/clang/19/share + fi + } +} + +libllvm19_package() { + short_desc+=" - library" + pkg_install() { + _vlink_libs "${_llvm_libdir}/libLLVM-*.so" + _vlink_libs "${_llvm_libdir}/libLLVM.so.*" + } +} + +llvm19-doc_package() { + short_desc+=" - documentation" + pkg_install() { + vmove ${_llvm_datadir}/doc + } +} + +llvm19-devel_package() { + depends="llvm19>=${version}_${revision}" + conflicts="llvm18-devel>=0 llvm17-devel>=0 llvm15-devel>=0" + short_desc+=" - development files" + if [ "$build_option_openmp" ]; then + depends+=" libomp19-devel>=${version}_${revision} " + fi + if [ "$build_option_mlir" ]; then + depends+=" mlir19-devel>=${version}_${revision} " + fi + if [ "$build_option_clang" ]; then + depends+=" clang19-devel>=${version}_${revision} " + fi + pkg_install() { + vmove ${_llvm_libdir}/libLLVM.so + vmove ${_llvm_libdir}/libLTO.so + vmove ${_llvm_libdir}/libRemarks.so + vmove ${_llvm_incdir}/llvm + vmove ${_llvm_incdir}/llvm-c + vmove "${_llvm_libdir}/libLLVM*.a" + vmove ${_llvm_libdir}/cmake/llvm + } +} + +# These binaries are ONLY used when building llvm, they aren't normally installed +llvm19-cross-tools_package() { + conflicts="llvm18-cross-tools>=0 llvm17-cross-tools>=0" + short_desc+=" - build tools for cross compiling LLVM" + depends="llvm19-devel>=${version}_${revision}" + if [ "$build_option_lldb" ]; then + depends+=" lldb19-devel>=${version}_${revision}" + fi + if [ "$build_option_lld" ]; then + depends+=" lld19-devel>=${version}_${revision}" + fi + if [ "$build_option_flang" ]; then + depends+=" flang19-devel>=${version}_${revision}" + fi + pkg_install() { + # Binaries ONLY used during the process of building llvm, and aren't usually installed + vmkdir ${_llvm_bindir} + vcopy build/bin/clang-tidy-confusable-chars-gen ${_llvm_bindir} + vcopy build/bin/clang-pseudo-gen ${_llvm_bindir} + + if [ "$build_option_lldb" ]; then + vcopy build/bin/lldb-tblgen ${_llvm_bindir} + fi + + if [ "$build_option_mlir" ]; then + vcopy build/bin/mlir-src-sharder ${_llvm_bindir} + fi + } +} + +libclc19_package() { + short_desc+=" - Open implementation of the OpenCL C programming language" + replaces="libclc-git>=0" + _libclc19_files=( + share/clc + include/clc + share/pkgconfig/libclc.pc + ) + for _alt in "${_libclc19_files[@]}"; do + alternatives+=" libclc:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}" + done + pkg_install() { + for _f in "${_libclc19_files[@]}"; do + vmove usr/${_llvm_prefix}/${_f} + done + } +} diff --git a/srcpkgs/llvm19/update b/srcpkgs/llvm19/update new file mode 100644 index 00000000000..21c281eb186 --- /dev/null +++ b/srcpkgs/llvm19/update @@ -0,0 +1,3 @@ +site="https://github.com/llvm/llvm-project/releases" +pattern="llvmorg-\K(19)\.(\d+)\.+\d+(-rc\d+)?" +ignore="*-rc*" diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template index 0e27b637e61..f79a66366a8 100644 --- a/srcpkgs/lms/template +++ b/srcpkgs/lms/template @@ -1,6 +1,6 @@ # Template file for 'lms' pkgname=lms -version=3.58.0 +version=3.59.1 revision=1 build_style=cmake configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick" @@ -13,7 +13,7 @@ maintainer="danoloan10 " license="GPL-3.0-or-later" homepage="https://github.com/epoupon/lms" distfiles="https://github.com/epoupon/lms/archive/refs/tags/v${version}.tar.gz " -checksum=557476f01f6e6527c656ff6b26383adc785d95c4017df2450d80eb67834ae3e0 +checksum=9024698acc9103c1b0ff836203f8126d993a80e010bd5d0463201a4a9b58f11d system_accounts="_lms" _lms_homedir="/var/lms" diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template index 3c796e15b05..257be05a714 100644 --- a/srcpkgs/lowdown/template +++ b/srcpkgs/lowdown/template @@ -1,6 +1,6 @@ # Template file for 'lowdown' pkgname=lowdown -version=1.1.2 +version=1.2.0 revision=1 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" @@ -12,7 +12,7 @@ license="ISC" homepage="https://kristaps.bsd.lv/lowdown/" changelog="https://kristaps.bsd.lv/lowdown/archive.html" distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz" -checksum=844c6b090729aa45c6459dd63cb1faaf8d9945ed59ea46387778cd91c67033b0 +checksum=4a853e1e49bca6ef532d075228b84585a29d88bbf4a7d26a70c5d4df260b9a3f post_install() { vlicense LICENSE.md diff --git a/srcpkgs/lsp-plugins-gst b/srcpkgs/lsp-plugins-gst new file mode 120000 index 00000000000..f59057b0c7f --- /dev/null +++ b/srcpkgs/lsp-plugins-gst @@ -0,0 +1 @@ +lsp-plugins \ No newline at end of file diff --git a/srcpkgs/lsp-plugins-vst3 b/srcpkgs/lsp-plugins-vst3 new file mode 120000 index 00000000000..f59057b0c7f --- /dev/null +++ b/srcpkgs/lsp-plugins-vst3 @@ -0,0 +1 @@ +lsp-plugins \ No newline at end of file diff --git a/srcpkgs/lsp-plugins/patches/aarch64-atomic.patch b/srcpkgs/lsp-plugins/patches/aarch64-atomic.patch new file mode 100644 index 00000000000..86282888c74 --- /dev/null +++ b/srcpkgs/lsp-plugins/patches/aarch64-atomic.patch @@ -0,0 +1,21 @@ +From 156be4d61c57d805745b85d7fadb781a4bc581b0 Mon Sep 17 00:00:00 2001 +From: Vladimir Sadovnikov +Date: Mon, 11 Nov 2024 14:50:21 +0300 +Subject: [PATCH] Fixed atomic operations for AArch64 + +--- + modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h +index 388a869..2e6288e 100644 +--- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h ++++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h +@@ -203,6 +203,7 @@ namespace lsp + ATOMIC_SWAP_DEF(uint32_t, "", "w") + ATOMIC_SWAP_DEF(int64_t, "", "x") + ATOMIC_SWAP_DEF(uint64_t, "", "x") ++ ATOMIC_SWAP_DEF(void *, "", "x") + } /* namespace lsp */ + + #undef ATOMIC_SWAP_DEF diff --git a/srcpkgs/lsp-plugins/patches/musl-locale.patch b/srcpkgs/lsp-plugins/patches/musl-locale.patch new file mode 100644 index 00000000000..55f37a8deb4 --- /dev/null +++ b/srcpkgs/lsp-plugins/patches/musl-locale.patch @@ -0,0 +1,42 @@ +commit b670813cf0757f01ce0d863aad429b7342f29a3e +Author: Daniel Martinez +Date: Mon Oct 14 15:25:09 2024 -0400 + + Add checks around locales + + With musl libc, many of the locale macros are not defined, causing build + errors + + Check that the macros are defined before using them + +diff --git a/src/main/locale.cpp b/src/main/locale.cpp +index 69ea619..ed84f5d 100644 +--- a/modules/lsp-common-lib/src/main/locale.cpp ++++ b/modules/lsp-common-lib/src/main/locale.cpp +@@ -40,14 +40,24 @@ namespace lsp + case LC_MONETARY: flags = LC_MONETARY_MASK; break; + case LC_MESSAGES: flags = LC_MESSAGES_MASK; break; + case LC_ALL: flags = LC_ALL_MASK; break; +- #if defined(PLATFORM_LINUX) ++ #if defined(LC_PAPER) + case LC_PAPER: flags = LC_PAPER_MASK; break; ++ #endif ++ #if defined(LC_NAME) + case LC_NAME: flags = LC_NAME_MASK; break; ++ #endif ++ #if defined(LC_ADDRESS) + case LC_ADDRESS: flags = LC_ADDRESS_MASK; break; ++ #endif ++ #if defined(LC_TELEPHONE) + case LC_TELEPHONE: flags = LC_TELEPHONE_MASK; break; ++ #endif ++ #if defined(LC_MEASUREMENT) + case LC_MEASUREMENT: flags = LC_MEASUREMENT_MASK; break; ++ #endif ++ #if defined(LC_IDENTIFICATION) + case LC_IDENTIFICATION: flags = LC_IDENTIFICATION_MASK; break; +- #endif /* PLATFORM_LINUX */ ++ #endif + + default: + return INVALID_LOCALE; diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template index 40dce0617d9..feedf060291 100644 --- a/srcpkgs/lsp-plugins/template +++ b/srcpkgs/lsp-plugins/template @@ -1,26 +1,55 @@ -# Template file for 'lsp-plugins' +# Template file for 'lsp-plugins'. pkgname=lsp-plugins -version=1.2.14 -revision=2 +version=1.2.19 +revision=1 build_style=gnu-makefile make_use_env=yes make_build_args="VERBOSE=0" hostmakedepends="pkg-config php lv2" makedepends="lv2 libglvnd-devel jack-devel libsndfile-devel - libXrandr-devel cairo-devel freetype-devel" + libXrandr-devel cairo-devel freetype-devel gst-plugins-base1-devel" depends="lsp-plugins-libs lsp-plugins-xdg - lsp-plugins-clap lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst2" + lsp-plugins-clap lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst2 + lsp-plugins-gst lsp-plugins-vst3" short_desc="Collection of open-source audio plugins for studios" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://lsp-plug.in/" changelog="https://raw.githubusercontent.com/sadko4u/lsp-plugins/master/CHANGELOG" distfiles="https://github.com/sadko4u/lsp-plugins/releases/download/$version/lsp-plugins-src-${version}.tar.gz" -checksum=1a3359ee8b8a82971bd7e9eeabe43f58ce6b4a4793d85fb16f97b100e4edee9a -nocross="Build system doesn't support cross-compilation properly" +checksum=f0536d790fada3d896670683b71a2916a7bef55a2395f314370015535ec8d959 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" ${makedepends}" +fi do_configure() { - make LD="$CXX" PREFIX=/usr config + _configure_args=( + PREFIX=/usr + LD="$CXX" + ARCHITECTURE="$XBPS_TARGET_MACHINE" + ARCHITECTURE_CFLAGS="$CFLAGS" + ARCHITECTURE_CXXFLAGS="$CXXFLAGS" + ARCHITECTURE_LDFLAGS="$LDFLAGS" + HOST_CC=cc + HOST_CXX=c++ + HOST_LD=c++ + ) + if [ "$CROSS_BUILD" ]; then + _configure_args+=( + CROSS_COMPILE=1 + HOST_ARCHITECTURE_CFLAGS="$XBPS_CFLAGS" + HOST_ARCHITECTURE_CXXFLAGS="$XBPS_CXXFLAGS" + HOST_ARCHITECTURE_LDFLAGS="$XBPS_LDFLAGS" + ) + else + _configure_args+=( + HOST_ARCHITECTURE_CFLAGS="$CFLAGS" + HOST_ARCHITECTURE_CXXFLAGS="$CXXFLAGS" + HOST_ARCHITECTURE_LDFLAGS="$LDFLAGS" + ) + fi + make config "${_configure_args[@]}" } lsp-plugins-libs_package() { @@ -73,6 +102,23 @@ lsp-plugins-vst2_package() { } } +lsp-plugins-gst_package() { + short_desc+=" - gst plugins" + depends="${sourcepkg}-libs>=${version}_${revision}" + pkg_install() { + vmove usr/lib/gstreamer-1.0 + vmove usr/lib/lsp-plugins/liblsp-plugins-gstreamer*.so + } +} + +lsp-plugins-vst3_package() { + short_desc+=" - vst3 plugins" + depends="${sourcepkg}-libs>=${version}_${revision}" + pkg_install() { + vmove usr/lib/vst3 + } +} + lsp-plugins-doc_package() { short_desc+=" - documentation" pkg_install() { diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template index d045dba2df7..fdc3a854872 100644 --- a/srcpkgs/lua-language-server/template +++ b/srcpkgs/lua-language-server/template @@ -1,6 +1,6 @@ # Template file for 'lua-language-server' pkgname=lua-language-server -version=3.10.6 +version=3.12.0 revision=1 hostmakedepends="ninja" short_desc="Lua LSP implementation written in Lua" @@ -9,7 +9,7 @@ license="MIT" homepage="https://luals.github.io" changelog="https://raw.githubusercontent.com/LuaLS/lua-language-server/master/changelog.md" distfiles="https://github.com/LuaLS/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip" -checksum=3e23b770489d5d5aec53fb102c93177d6768dd1bede411db322aa2455f22d150 +checksum=cd39ce51a1b7a9ec5dcc413e7e7024ac706503e084b0d8adc0804d7e23b3995b do_build() { ninja -C 3rd/luamake -f compile/ninja/linux.ninja diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template index fc3bb277106..201d672793e 100644 --- a/srcpkgs/lximage-qt/template +++ b/srcpkgs/lximage-qt/template @@ -1,6 +1,6 @@ # Template file for 'lximage-qt' pkgname=lximage-qt -version=2.0.1 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-base qt6-tools perl" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lximage-qt/archive/${version}.tar.gz" -checksum=86eaa8f98b31bc612d1a9cadafd4dcb8584f9a4b88e2972358cd3806bd635c3b +checksum=afb95edd057b66eb40d993b19ba8b6fceb74f07ba6a0ae5180424f96fc6e9c9f diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template index 5b69ec9fd45..1dca14e50c0 100644 --- a/srcpkgs/lxqt-about/template +++ b/srcpkgs/lxqt-about/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-about' pkgname=lxqt-about -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl" @@ -10,4 +10,4 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-about/archive/${version}.tar.gz" -checksum=1ee37f2cb0973e53dcbb22495800490dcac7576ff68ed408833727a5d28391d0 +checksum=9000df108c31b2d350732fbecf3a112b84aa0540ef71b3d35422c1aab19328d2 diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template index 5db1faab204..04b4198f250 100644 --- a/srcpkgs/lxqt-admin/template +++ b/srcpkgs/lxqt-admin/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-admin' pkgname=lxqt-admin -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools polkit-qt6-devel @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-admin/archive/${version}.tar.gz" -checksum=3dd39127e2715c504ce7a3996ffb3f70f18260249ac70245d30b0251a1e02e4b +checksum=29d108543e0f78b4136926ebf211f779fa144d11eb5b17429651629f4b77b8e5 diff --git a/srcpkgs/lxqt-archiver/template b/srcpkgs/lxqt-archiver/template index 2f4d7104367..b7f0f096f77 100644 --- a/srcpkgs/lxqt-archiver/template +++ b/srcpkgs/lxqt-archiver/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-archiver' pkgname=lxqt-archiver -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools pkg-config qt6-base qt6-tools perl" @@ -10,4 +10,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/${pkgname}/archive/${version}.tar.gz" -checksum=60d14500f1eafb39be4d810dad01a0659a03a2fc98b6a3e90d3b2596a778027f +checksum=c623a4cb9da521289ddb4fae1e44a80878476c0738732004ba3092e130fe7fab diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template index feb44baecc5..c7e9e292b5a 100644 --- a/srcpkgs/lxqt-build-tools/template +++ b/srcpkgs/lxqt-build-tools/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-build-tools' pkgname=lxqt-build-tools -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-base" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="BSD-3-Clause" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-build-tools/archive/${version}.tar.gz" -checksum=d433ce4de6e69d72de7692424dc5f6bed492c09130a8a59bcd63b20f4d88d328 +checksum=f24679bd4f50900981cf614c1341b6fbcf81d8ab3dbccae435f7ee878fc1b060 post_install() { vlicense BSD-3-Clause LICENSE diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template index 844a45240d7..51098f5be72 100644 --- a/srcpkgs/lxqt-config/template +++ b/srcpkgs/lxqt-config/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-config' pkgname=lxqt-config -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake configure_args="-DCMAKE_CXX_STANDARD=17" @@ -14,4 +14,4 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-config/archive/${version}.tar.gz" -checksum=fc8fafe278602f6891751582f986d2814699ffa79d8370913815af146ec16c0b +checksum=3c9e4949a33b08b10b27625d51002446085208e80e5202f40e4fc43c5a2cbd39 diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template index 482c5c6dd77..42cddfb7d90 100644 --- a/srcpkgs/lxqt-globalkeys/template +++ b/srcpkgs/lxqt-globalkeys/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-globalkeys' pkgname=lxqt-globalkeys -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-globalkeys/archive/${version}.tar.gz" -checksum=9fdb260d42eeb08338a6ba0bea5ce426539231944f73ec1954299ad8b5b114a7 +checksum=ee920d4de64aeea5c885fee4e27c490e7f8b4240fb5627bc9b5660404ef3da64 replaces="lxqt-common>=0" lxqt-globalkeys-devel_package() { diff --git a/srcpkgs/lxqt-menu-data/template b/srcpkgs/lxqt-menu-data/template index c964316992e..c1f473a97f8 100644 --- a/srcpkgs/lxqt-menu-data/template +++ b/srcpkgs/lxqt-menu-data/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-menu-data' pkgname=lxqt-menu-data -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-base qt6-tools lxqt-build-tools perl" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-menu-data/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=44768dd5dcc7c66fadd919ddd8528e22dd7ee587ef198b02dffbf05e0c0d1a52 +checksum=d2d2187313c16fc435a7313e53b80ace7ccba0b5de6c0d9cd53bfdfa13d5eab4 lxqt-menu-data-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template index 1f3d1d9bb19..390bb5bbce7 100644 --- a/srcpkgs/lxqt-notificationd/template +++ b/srcpkgs/lxqt-notificationd/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-notificationd' pkgname=lxqt-notificationd -version=2.0.1 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl" @@ -10,5 +10,5 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-notificationd/archive/${version}.tar.gz" -checksum=5df2caca84ac7cb21f043a0b1f76c8ca195a3302fd94f351a33071ec039c5bf4 +checksum=b8ddf7a93eb060a375c7e5c470890906f235eba1ced106b0f709a6433c7b0f3f replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template index 31d7162266e..b9667d78002 100644 --- a/srcpkgs/lxqt-openssh-askpass/template +++ b/srcpkgs/lxqt-openssh-askpass/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-openssh-askpass' pkgname=lxqt-openssh-askpass -version=2.0.1 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl" @@ -11,5 +11,5 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-openssh-askpass/archive/${version}.tar.gz" -checksum=d60175cae6ba59aca407790826af80c6e72ab46345e3f5202f9874c07a1dfc8e +checksum=63377ee3c189c28926d43d5cf73c543edea289878bb11fc92a5701c6013936bd alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass" diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template index e03a8e9c46e..ad468234c4a 100644 --- a/srcpkgs/lxqt-panel/template +++ b/srcpkgs/lxqt-panel/template @@ -1,18 +1,19 @@ # Template file for 'lxqt-panel' pkgname=lxqt-panel -version=2.0.1 +version=2.1.1 revision=1 build_style=cmake -hostmakedepends="pkg-config lxqt-build-tools qt6-base qt6-tools perl" +configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" +hostmakedepends="pkg-config lxqt-build-tools qt6-base qt6-tools perl wayland-devel qt6-wayland-tools" makedepends="libxkbcommon-devel liblxqt-devel ksolid-devel kguiaddons-devel lxqt-globalkeys-devel alsa-lib-devel pulseaudio-devel libstatgrab-devel libsensors-devel libsysstat-devel libdbusmenu-lxqt-devel lxqt-menu-data-devel libqtxdg-devel libxcb-devel libXtst-devel xcb-util-image-devel layer-shell-qt-devel - kf6-solid-devel" + kf6-solid-devel qt6-wayland-devel" depends="lxqt-menu-data" short_desc="LXQt desktop panel" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-panel/archive/${version}.tar.gz" -checksum=dcbd27321262e01404ad52fc514a7f123d1b68c94eab377f10199657ec9177c9 +checksum=64146535bcdeeb4a1877bd51ecfcd9f8125458bb4b905f1d238534d13dea7150 diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template index 3c115e73542..b027484e6e7 100644 --- a/srcpkgs/lxqt-policykit/template +++ b/srcpkgs/lxqt-policykit/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-policykit' pkgname=lxqt-policykit -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-tools polkit-qt6-devel perl" @@ -10,5 +10,5 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-policykit/archive/${version}.tar.gz" -checksum=476d9fce398c2443e1c688453b013250294ec688154a3ea842b7d088295f9559 +checksum=b68a6baa801b89a6fdbf95f81d63c7dd12ebadc81175eb69f9077c7f6e9b3e84 replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template index 99966f7e287..eafca1442cf 100644 --- a/srcpkgs/lxqt-powermanagement/template +++ b/srcpkgs/lxqt-powermanagement/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-powermanagement' pkgname=lxqt-powermanagement -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl" @@ -10,4 +10,4 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-powermanagement/archive/${version}.tar.gz" -checksum=f2b78375f39467de92489edf7a6e84efe49d241634f2df389b455394140fbb66 +checksum=368d85fe1c313433861c24868c71e87b43bd29cc3409724b667419a6be6a2033 diff --git a/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch b/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch index e2d0e4e96af..788b1355d99 100644 --- a/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch +++ b/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch @@ -1,22 +1,14 @@ ---- a/src/CMakeLists.txt 2024-05-12 11:05:21.807798096 +0200 -+++ b/src/CMakeLists.txt 2024-05-12 11:08:47.625736216 +0200 -@@ -51,10 +51,14 @@ - endif() +--- a/src/CMakeLists.txt 2024-11-17 09:49:24.950405832 +0100 ++++ b/src/CMakeLists.txt 2024-11-17 09:50:09.911456731 +0100 +@@ -39,7 +39,9 @@ + Qt6XdgIconLoader + ) - # execute the command "qmake -query QT_INSTALL_PLUGINS" to get the path of plugins dir. --execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS -- OUTPUT_VARIABLE QT_PLUGINS_DIR -- OUTPUT_STRIP_TRAILING_WHITESPACE --) -+if (NOT QT_PLUGIN_INSTALL_PATH) -+ execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS -+ OUTPUT_VARIABLE QT_PLUGINS_DIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+else () -+ set(QT_PLUGINS_DIR ${QT_PLUGIN_INSTALL_PATH}) +-lxqt_query_qt(_QT_PLUGINS_DIR QT_INSTALL_PLUGINS) ++if (NOT _QT_PLUGINS_DIR) ++ lxqt_query_qt(_QT_PLUGINS_DIR QT_INSTALL_PLUGINS) +endif() -+ - if(QT_PLUGINS_DIR) - message(STATUS "Qt6 plugin directory:" "${QT_PLUGINS_DIR}") - else() + + if (NOT _QT_PLUGINS_DIR) + message(FATAL_ERROR "Qt6 plugin directory cannot be detected.") diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template index b95d962e53d..8eefe44458e 100644 --- a/srcpkgs/lxqt-qtplugin/template +++ b/srcpkgs/lxqt-qtplugin/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-qtplugin' pkgname=lxqt-qtplugin -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools libfm-devel" @@ -10,10 +10,10 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz" -checksum=1e173aaa7793ea6bdc4cddc35ab0cb25b7fc09e81b28005b46ee21b65ab65dc8 +checksum=eec583014590acc6e431420cbb0e67c01e7113eac82b287da5f9a39916e3164c case "${XBPS_TARGET_MACHINE}" in armv6l*|armv7l*) - configure_args=" -DQT_PLUGIN_INSTALL_PATH=/usr/lib/qt6/plugins" + configure_args=" -D_QT_PLUGINS_DIR=/usr/lib/qt6/plugins" esac diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template index 307bd44288d..6f40ab82638 100644 --- a/srcpkgs/lxqt-runner/template +++ b/srcpkgs/lxqt-runner/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-runner' pkgname=lxqt-runner -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-base qt6-tools perl" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-runner/archive/${version}.tar.gz" -checksum=78446cc7080f4b2cdd54540b1be2816d020483d6aeb490dfa611cfbd95aabad6 +checksum=4a53d50a341cb63af61bab6bbb15312f3841cdc3820dc5fd5f725138e8af9906 diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template index a9100d6c5ef..e890084f851 100644 --- a/srcpkgs/lxqt-session/template +++ b/srcpkgs/lxqt-session/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-session' pkgname=lxqt-session -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-base qt6-tools xdg-user-dirs @@ -13,5 +13,5 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-session/archive/${version}.tar.gz" -checksum=8e483b09e423cb32d5c761a953fe49a921984e72e62241b14b467ab5d83fb15b +checksum=a9fe58a59f2e35e5d0b3b6d58aaee87bacf30265da74f5f2f15e11178bb1e162 replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template index 5f473862f40..666805ca895 100644 --- a/srcpkgs/lxqt-sudo/template +++ b/srcpkgs/lxqt-sudo/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-sudo' pkgname=lxqt-sudo -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-sudo/archive/${version}.tar.gz" -checksum=e86b6d69a5625f693deb424f7c88e9f3a7041f11ee5b86d3714259e683611802 +checksum=1e55334792c77dce55668b4d60e8409ec608915b8e92fb9c9d53d248a333cf10 diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template index 928ddc32aa1..43df4fc9ec5 100644 --- a/srcpkgs/lxqt-themes/template +++ b/srcpkgs/lxqt-themes/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-themes' pkgname=lxqt-themes -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools perl" @@ -10,5 +10,5 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-themes/archive/${version}.tar.gz" -checksum=9d6798f366bbe5e7fdbfecb46390cc741828f0e1f8088980e89bf49b6d280c39 +checksum=9b4f6fb3d462bf40fef033885abab4dcf2c797745e914f1466ea0d2d81d97bd4 replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template index e2a8a4ed7d1..0f4e535ce15 100644 --- a/srcpkgs/lxqt/template +++ b/srcpkgs/lxqt/template @@ -1,6 +1,6 @@ # Template file for 'lxqt' pkgname=lxqt -version=2.0.0 +version=2.1.0 revision=1 build_style=meta depends=" diff --git a/srcpkgs/lychee/template b/srcpkgs/lychee/template index 6cad9b5a14a..e1fae24c8ae 100644 --- a/srcpkgs/lychee/template +++ b/srcpkgs/lychee/template @@ -1,6 +1,6 @@ # Template file for 'lychee' pkgname=lychee -version=0.15.1 +version=0.17.0 revision=1 build_style=cargo configure_args="--bin lychee" @@ -12,8 +12,8 @@ maintainer="icp " license="Apache-2.0, MIT" homepage="https://lychee.cli.rs" changelog="https://github.com/lycheeverse/lychee/releases" -distfiles="https://github.com/lycheeverse/lychee/archive/refs/tags/v${version}.tar.gz" -checksum=21c52aab5eefb0fda578f8192dffc5b776954e585f5692b87079cbb52ac1d89c +distfiles="https://github.com/lycheeverse/lychee/archive/refs/tags/lychee-v${version}.tar.gz" +checksum=78b006105363ce0e989401124fd8bcb0b60d697db2cb29c71f2cdd7f5179c91c post_install() { vlicense LICENSE-APACHE diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template index 788e3c2800c..a75f569d677 100644 --- a/srcpkgs/makedumpfile/template +++ b/srcpkgs/makedumpfile/template @@ -1,6 +1,6 @@ # Template file for 'makedumpfile' pkgname=makedumpfile -version=1.7.5 +version=1.7.6 revision=1 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel" depends="perl" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/makedumpfile/makedumpfile" distfiles="${homepage}/archive/refs/tags/${version}.tar.gz" -checksum=0c53f1e5e11e75e4896197df795bee63b3d46b8821fbc3368f7a240861b543b5 +checksum=c949a5b2ad95e5f83a6d1b4faac0972510e4286b0e3257020762e45357816a61 post_extract() { sed -i '/#define PAGESIZE/i#undef PAGESIZE' makedumpfile.h diff --git a/srcpkgs/mandown/template b/srcpkgs/mandown/template index 3a41e908d8a..e961b43875d 100644 --- a/srcpkgs/mandown/template +++ b/srcpkgs/mandown/template @@ -1,6 +1,6 @@ # Template file for 'mandown' pkgname=mandown -version=0.1.4 +version=0.1.5 revision=1 build_style=cargo short_desc="Create man pages from markdown markup" @@ -8,4 +8,4 @@ maintainer="Savoy " license="Apache-2.0" homepage="https://gitlab.com/kornelski/mandown" distfiles="https://gitlab.com/kornelski/mandown/-/archive/${version}/mandown-${version}.tar.gz" -checksum=9c4a5ccba8ae9e12eccdbfed96acf8a5305b7e1406418edfc8a045ad79842062 +checksum=32bf99a42dc7190733658a1beb7bc222d47441fbcb423905ca0fae2f3a32a87f diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template index fd9f680723d..2a181e32e75 100644 --- a/srcpkgs/mandrel/template +++ b/srcpkgs/mandrel/template @@ -1,6 +1,6 @@ # Template file for 'mandrel' pkgname=mandrel -version=23.1.4.0 +version=23.1.5.0 revision=1 _java_ver=21 _mx_ver=6.53.2 @@ -15,8 +15,8 @@ homepage="https://github.com/graalvm/mandrel" distfiles="https://github.com/graalvm/mandrel-packaging/archive/refs/tags/mandrel-${version}-Final.tar.gz>packaging-${version}.tar.gz https://github.com/graalvm/mandrel/archive/refs/tags/mandrel-${version}-Final.tar.gz https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz" -checksum="dfba8ffb81b57cdb618166bf54b4b9361988bf2e1e0d16db4dd33f1a8438f470 - 11a9c3ac12b9804826eaede254c615e392fed6867578635a7688f5080a06c2c4 +checksum="0ccf0811b0b0116e848837469aaf957f167247fee4e70488bc838c9dc38fe7cf + 15e190df0e9e38d961a1274957c23eff765cf3c9dd67440e67e32e8ae0f63ad4 567c95449922b448d78daade5ba7bd91729a75367b69806f1bd590988a1ef717" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" nocross=yes diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template index 26e7c877718..e0ec2cfd0db 100644 --- a/srcpkgs/mash/template +++ b/srcpkgs/mash/template @@ -4,7 +4,8 @@ version=0.2.0 revision=9 build_style=gnu-configure build_helper="gir" -configure_args="--disable-static $(vopt_enable gir introspection)" +configure_args="--disable-static $(vopt_enable gir introspection) + --enable-gtk-doc" hostmakedepends="automake glib-devel intltool libtool pkg-config $(vopt_if gir gobject-introspection) gtk-doc" makedepends="clutter-devel" @@ -13,8 +14,9 @@ short_desc="Small library for using 3D models within a Clutter scene" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://clutter-project.github.io/mash/" -distfiles="https://github.com/downloads/clutter-project/mash/mash-${version}.tar.xz" -checksum=fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc +distfiles="https://github.com/clutter-project/mash/archive/refs/tags/${version}.tar.gz" +checksum=a5f91f0828c3c63a845800443ab347417cb34882db3b6672b42f6d68355ddab8 +nocross="Build system executes what it builds" build_options="gir" build_options_default="gir" @@ -30,9 +32,7 @@ mash-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc - if [ -z "$CROSS_BUILD" ]; then - vmove usr/share/gir-1.0 - fi + vmove usr/share/gir-1.0 vmove usr/lib/*.so } } diff --git a/srcpkgs/mate-notification-daemon/template b/srcpkgs/mate-notification-daemon/template index 179484c6ae6..b7f905fc053 100644 --- a/srcpkgs/mate-notification-daemon/template +++ b/srcpkgs/mate-notification-daemon/template @@ -1,6 +1,6 @@ # Template file for 'mate-notification-daemon' pkgname=mate-notification-daemon -version=1.28.0 +version=1.28.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-wayland" @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-notification-daemon/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-notification-daemon-${version}.tar.xz" -checksum=a4310348ead866cbcb9b4c463f4d265cc6a96a1a782a9411a08b23bd65dbb2e0 +checksum=fffef553bea15becff5ed40d64e18c23d3b649c4599cc1eb1e82f70533853b34 diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template index 4ef96bb9daf..8abda4f1cbf 100644 --- a/srcpkgs/mate-panel/template +++ b/srcpkgs/mate-panel/template @@ -1,7 +1,7 @@ # Template file for 'mate-panel' pkgname=mate-panel -version=1.28.2 -revision=2 +version=1.28.4 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static --disable-schemas-compile @@ -21,7 +21,7 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-panel/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-panel-${version}.tar.xz" -checksum=678a43e837aa2718494204fddf19bb906cf07e5d80fd2e1dde745f26d2adba33 +checksum=02f09eb0314c2ac197b6f089950a571cdba39bfd03d6c3a0b8fd77252a968874 build_options="gir wayland" build_options_default="gir wayland" diff --git a/srcpkgs/matterbridge/files/matterbridge/run b/srcpkgs/matterbridge/files/matterbridge/run new file mode 100644 index 00000000000..f88aa378559 --- /dev/null +++ b/srcpkgs/matterbridge/files/matterbridge/run @@ -0,0 +1,5 @@ +#!/bin/sh +exec 2>&1 +[ -r ./conf ] && . ./conf + +exec matterbridge -conf "${MATTERBRIDGE_CONFIG:-/etc/matterbridge.toml}" diff --git a/srcpkgs/matterbridge/template b/srcpkgs/matterbridge/template new file mode 100644 index 00000000000..3ca8a027c5a --- /dev/null +++ b/srcpkgs/matterbridge/template @@ -0,0 +1,20 @@ +# Template file for 'matterbridge'. +pkgname=matterbridge +version=1.26.0 +revision=1 +build_style=go +go_import_path="github.com/42wim/matterbridge" +short_desc="Bridge between various chatting services" +maintainer="Luca Matei Pintilie " +license="Apache-2.0" +homepage="https://github.com/42wim/matterbridge/" +changelog="https://github.com/42wim/matterbridge/releases/" +distfiles="https://github.com/42wim/matterbridge/archive/refs/tags/v$version.tar.gz" +checksum=00e1bbfe3b32f2feccf9a7f13a6f12b1ce28a5eb04cc7b922b344e3493497425 + +post_install() { + for _conf in matterbridge.toml.*; do + vsconf "${_conf}" + done + vsv matterbridge +} diff --git a/srcpkgs/mazter/template b/srcpkgs/mazter/template index cff89608ab7..cd852e8a7ac 100644 --- a/srcpkgs/mazter/template +++ b/srcpkgs/mazter/template @@ -1,6 +1,6 @@ # Template file for 'mazter' pkgname=mazter -version=1.0.0 +version=2.1.1 revision=1 build_style=cargo short_desc="Mazes in your terminal" @@ -8,7 +8,8 @@ maintainer="icp " license="MIT" homepage="https://dystroy.org/mazter/" distfiles="https://static.crates.io/crates/mazter/mazter-${version}.crate" -checksum=0e2de0a4fa68700fba6beaf243076f24722cd924aaa9cadb018ad209b4893db0 +checksum=3c56ba0093b30ed4e96e7df7906fa1d7a497147e2a536c9a2a56d9d89700c299 +make_check=no # panic in todo! post_install() { vlicense LICENSE diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index 82654ad266f..aefe769844e 100644 --- a/srcpkgs/mcelog/template +++ b/srcpkgs/mcelog/template @@ -1,6 +1,6 @@ # Template file for 'mcelog' pkgname=mcelog -version=200 +version=201 revision=1 archs="i686* x86_64*" hostmakedepends="python3" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="http://www.mcelog.org/" distfiles="https://github.com/andikleen/mcelog/archive/v${version}.tar.gz" -checksum=0a0efa3c7704abaeff52f01e0da8d867c86886a1d033d9ec038e477e2d1e95e8 +checksum=635a2bdce0801fc67f4c5df901daec6d3843226801615d809e56d9f3759ccbe9 do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs} diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template index 206a00e6342..c6de966cd76 100644 --- a/srcpkgs/mdBook/template +++ b/srcpkgs/mdBook/template @@ -1,6 +1,6 @@ # Template file for 'mdBook' pkgname=mdBook -version=0.4.40 +version=0.4.42 revision=1 build_style=cargo build_helper=qemu @@ -10,7 +10,7 @@ license="MPL-2.0" homepage="https://github.com/rust-lang/mdBook" changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md" distfiles="https://github.com/rust-lang/mdBook/archive/refs/tags/v${version}.tar.gz" -checksum=550da7ff02ef62c60db6e813b6dbae65b9ed3d491186ea74929536feaceea94b +checksum=cf1c7c293fd1ad3d51fe13cd385303df8b30004ba5edcc35dd8dbd23d670d528 post_install() { vlicense LICENSE diff --git a/srcpkgs/mdbook-mermaid/template b/srcpkgs/mdbook-mermaid/template index 5ceff23aa55..ff883b54fca 100644 --- a/srcpkgs/mdbook-mermaid/template +++ b/srcpkgs/mdbook-mermaid/template @@ -1,6 +1,6 @@ # Template file for 'mdbook-mermaid' pkgname=mdbook-mermaid -version=0.13.0 +version=0.14.0 revision=1 build_style=cargo short_desc="Preprocessor for mdbook to add mermaid support" @@ -9,7 +9,7 @@ license="MPL-2.0" homepage="https://github.com/badboy/mdbook-mermaid" changelog="https://raw.githubusercontent.com/badboy/mdbook-mermaid/main/CHANGELOG.md" distfiles="https://github.com/badboy/mdbook-mermaid/archive/refs/tags/v${version}.tar.gz" -checksum=244fa070106d070786d1c5a37fe921059db941860583003aa654775d98936671 +checksum=79c000c81b9c9c6f0b10d14d8ca3a53a6db62fdd0ac128ce4842158f0e04de98 post_install() { vlicense LICENSE diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template index 6b819fac30c..2f5b13189d1 100644 --- a/srcpkgs/mdcat/template +++ b/srcpkgs/mdcat/template @@ -1,6 +1,6 @@ # Template file for 'mdcat' pkgname=mdcat -version=2.3.1 +version=2.6.1 revision=1 build_style=cargo build_helper=qemu @@ -14,7 +14,7 @@ license="MPL-2.0" homepage="https://github.com/swsnr/mdcat" changelog="https://raw.githubusercontent.com/swsnr/mdcat/main/CHANGELOG.md" distfiles="https://github.com/swsnr/mdcat/archive/refs/tags/mdcat-${version}.tar.gz" -checksum=5dbee35f8b582bb3a023133fc564103e49d16f10a62e7a07ddf29a06fa2d48f5 +checksum=0dac8322b74d3eefc412ea13fca448aac43b257a3ff3e361d3343c6220a6618f make_check=ci-skip # uses network tests which fail in CI case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/memtest86+/files/20_memtest86+ b/srcpkgs/memtest86+/files/20_memtest86+ index 38648b365f8..5a81a556ed7 100644 --- a/srcpkgs/memtest86+/files/20_memtest86+ +++ b/srcpkgs/memtest86+/files/20_memtest86+ @@ -3,8 +3,8 @@ set -e # older versions of grub2 do not have this yet (LP: #459080) if [ ! -e /usr/share/grub/grub-mkconfig_lib ]; then - echo "no grub-mkconfig_lib, exiting" - exit 0 + echo "no grub-mkconfig_lib, exiting" + exit 0 fi . /usr/share/grub/grub-mkconfig_lib @@ -15,8 +15,8 @@ else MEMTESTSFX="efi" fi -if [ -e /boot/memtest.bin ]; then - MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.bin" ) +if [ -e /boot/memtest86+/memtest.bin ]; then + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+/memtest.bin" ) echo "Found memtest86+ image: $MEMTESTPATH" >&2 cat <<- EOF if [ "\${grub_platform}" != "efi" ]; then @@ -35,8 +35,8 @@ if [ -e /boot/memtest.bin ]; then fi EOF fi -if [ -e /boot/memtest.efi ]; then - MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.efi" ) +if [ -e /boot/memtest86+/memtest.efi ]; then + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+/memtest.efi" ) echo "Found memtest86+ image: $MEMTESTPATH" >&2 cat <<- EOF if [ "\${grub_platform}" = "efi" ]; then diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template index 6ca843a0fe0..e5c9bba382b 100644 --- a/srcpkgs/memtest86+/template +++ b/srcpkgs/memtest86+/template @@ -1,19 +1,21 @@ # Template file for 'memtest86+' pkgname=memtest86+ -version=7.00 +version=7.20 revision=1 archs="i686* x86_64*" -short_desc="Advanced Memory Diagnostic Tool - upstream binary" +build_wrksrc="build$XBPS_TARGET_WORDSIZE" +build_style="gnu-makefile" +make_use_env=yes # we DON'T want our cflags to be used +short_desc="Advanced Memory Diagnostic Tool" maintainer="classabbyamp " license="GPL-2.0-or-later" homepage="http://www.memtest.org" -distfiles="https://www.memtest.org/download/v${version}/mt86plus_${version}.binaries.zip" -checksum=19894151788a99c25c42644696527aba18cb210b2f9bca4a60e73586a6d78286 +distfiles="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${version}.tar.gz" +checksum=8bad4b5788bc28e4dd1db78c9069bd0c65a4a6baf16409ab537c795bb04578b3 nostrip=yes -noverifyrdeps=yes do_install() { - vinstall "memtest${XBPS_TARGET_WORDSIZE}.bin" 755 boot memtest.bin - vinstall "memtest${XBPS_TARGET_WORDSIZE}.efi" 755 boot memtest.efi + vinstall memtest.bin 755 boot/memtest86+ + vinstall memtest.efi 755 boot/memtest86+ vinstall "${FILESDIR}/20_memtest86+" 755 etc/grub.d } diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 3ab9e22e640..bbbfeb03bda 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,6 +1,6 @@ # Template file for 'mercurial' pkgname=mercurial -version=6.8.1 +version=6.8.2 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools python3-devel gettext git" @@ -13,7 +13,7 @@ maintainer="dataCobra " license="GPL-2.0-or-later" homepage="https://www.mercurial-scm.org/" distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz" -checksum=030e8a7a6d590e4eaeb403ee25675615cd80d236f3ab8a0b56dcc84181158b05 +checksum=aac618106768ad1ed976c3fe7c8659fec99e6f0b5337ea6ea554fae8490c4f4e pre_check() { if [ "$XBPS_TARGET_LIBC" = musl ]; then diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 901a1ebcaa8..0ff83ace155 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,6 +1,6 @@ # Template file for 'mesa' pkgname=mesa -version=24.2.4 +version=24.2.6 revision=1 build_style=meson _llvmver=18 @@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=5ea42a8bb6d58aec9754c9f553b1e413f67c09403741f8e2786c3f9e63d3461a +checksum=2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709 build_options="wayland" build_options_default="wayland" diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template index 407a22f2836..231f4b004c3 100644 --- a/srcpkgs/micro/template +++ b/srcpkgs/micro/template @@ -1,7 +1,7 @@ # Template file for 'micro' pkgname=micro -version=2.0.13 -revision=2 +version=2.0.14 +revision=1 build_style=go go_import_path="github.com/zyedidia/micro/v2" go_package="${go_import_path}/cmd/micro" @@ -13,7 +13,7 @@ maintainer="0x5c " license="MIT" homepage="https://micro-editor.github.io" distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz" -checksum=a96fff974ed6bd9a1dd58a33e54ff23b78783bbb3571b86d5c37d787b1e0e4be +checksum=40177579beb3846461036387b649c629395584a4bbe970f61ba7591bd9c0185a pre_build() { GOARCH= go generate ./runtime diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 7c5279aab9b..459d1205a2e 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -1,6 +1,6 @@ # Template file for 'minify' pkgname=minify -version=2.21.0 +version=2.21.1 revision=1 build_style=go go_import_path="github.com/tdewolff/minify/v2" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/tdewolff/minify" distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz" -checksum=3f8db865e2b875dfa588ebca5ff4f092c9b98a06b66361b3c6f4918b2564cc89 +checksum=076ea8bb067f2a17036fa4b37ccc42648090ba3ffadfc5d57a469d289b19d354 post_install() { vlicense LICENSE diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template index 631a9205e4b..b7164d18878 100644 --- a/srcpkgs/miniserve/template +++ b/srcpkgs/miniserve/template @@ -1,6 +1,6 @@ # Template file for 'miniserve' pkgname=miniserve -version=0.27.1 +version=0.28.0 revision=1 build_style=cargo build_helper=qemu @@ -17,7 +17,7 @@ license="MIT" homepage="https://github.com/svenstaro/miniserve" changelog="https://raw.githubusercontent.com/svenstaro/miniserve/master/CHANGELOG.md" distfiles="https://github.com/svenstaro/miniserve/archive/refs/tags/v${version}.tar.gz" -checksum=b65580574ca624072b1a94d59ebf201ab664eacacb46a5043ef7b81ebb538f80 +checksum=c4c5e12796bdae2892eff3832b66c4c04364738b62cf1429259428b03363d1f1 make_check=ci-skip # port binding succeeds locally but fails in CI case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/minissdpd/template b/srcpkgs/minissdpd/template index 8abcbc4c0e6..1f9ec9112b1 100644 --- a/srcpkgs/minissdpd/template +++ b/srcpkgs/minissdpd/template @@ -7,8 +7,8 @@ makedepends="libnfnetlink-devel" short_desc="MiniSSDP Daemon to speed up UPnP device discovery" maintainer="Duncaen " license="BSD-3-Clause" -homepage="http://miniupnp.free.fr/minissdpd.html" -distfiles="http://miniupnp.free.fr/files/minissdpd-${version}.tar.gz" +homepage="https://miniupnp.tuxfamily.org/minissdpd.html" +distfiles="https://miniupnp.tuxfamily.org/files/minissdpd-${version}.tar.gz" checksum=f4c2dea6a472e0a5cc9dca2dc4c1fc36ba5538eacf8d793825293251725546bd CFLAGS="-D_GNU_SOURCE" diff --git a/srcpkgs/ministat/template b/srcpkgs/ministat/template index acb5a0652cb..bb22530a1c6 100644 --- a/srcpkgs/ministat/template +++ b/srcpkgs/ministat/template @@ -1,14 +1,14 @@ # Template file for 'ministat' pkgname=ministat -version=10.0 -revision=3 +version=15.0 +revision=1 build_style=gnu-makefile short_desc="Small statistics utility" maintainer="Leah Neukirchen " license="Beerware" homepage="https://github.com/leahneukirchen/ministat" distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz" -checksum=5362d702178e2539efa5e4b8049247ca500a9fd88b31459553ff31266c751e8f +checksum=9e429718d3dac225ea4014ba5758b9b45ac3ff30ca101a325a111e58551d6f68 post_install() { sed -n '2,7p' LICENSE diff --git a/srcpkgs/miniupnpc/template b/srcpkgs/miniupnpc/template index 327ab6f982a..868fc53da59 100644 --- a/srcpkgs/miniupnpc/template +++ b/srcpkgs/miniupnpc/template @@ -9,9 +9,9 @@ checkdepends="inetutils-ifconfig" short_desc="Small UPnP client library/tool to access Internet Gateway Devices" maintainer="Orphaned " license="BSD-3-Clause" -#changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-${version}.tar.gz" -homepage="http://miniupnp.free.fr" -distfiles="http://miniupnp.free.fr/files/${pkgname}-${version}.tar.gz" +#changelog="https://miniupnp.tuxfamily.org/files/changelog.php?file=miniupnpc-${version}.tar.gz" +homepage="https://miniupnp.tuxfamily.org" +distfiles="https://miniupnp.tuxfamily.org/files/${pkgname}-${version}.tar.gz" checksum=b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1 post_install() { diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template index aed8b309471..6bd8f4da651 100644 --- a/srcpkgs/miniupnpd/template +++ b/srcpkgs/miniupnpd/template @@ -20,9 +20,9 @@ checkdepends="iproute2 which" short_desc="Lightweight UPnP IGD daemon" maintainer="Duncaen " license="BSD-3-Clause" -homepage="http://miniupnp.free.fr" -changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpd-${version}.tar.gz" -distfiles="http://miniupnp.free.fr/files/miniupnpd-${version}.tar.gz" +homepage="https://miniupnp.tuxfamily.org" +changelog="https://miniupnp.tuxfamily.org/files/changelog.php?file=miniupnpd-${version}.tar.gz" +distfiles="https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz" checksum=fbdd5501039730f04a8420ea2f8f54b7df63f9f04cde2dc67fa7371e80477bbe if [ "$XBPS_TARGET_LIBC" = "musl" ]; then diff --git a/srcpkgs/mise/template b/srcpkgs/mise/template index f4354ad6d59..4a228d8bcef 100644 --- a/srcpkgs/mise/template +++ b/srcpkgs/mise/template @@ -1,6 +1,6 @@ # Template file for 'mise' pkgname=mise -version=2024.10.1 +version=2024.11.13 revision=1 build_style=cargo make_check_args="-- --skip cli --skip runtime_symlinks::tests::test_list_symlinks" @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/jdx/mise" changelog="https://github.com/jdx/mise/releases" distfiles="https://github.com/jdx/mise/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=cd6a558b514468aaaf2f878b9e99f4ce6421857f341d8c99a45b56f76e633709 +checksum=1c119ff8cf94a746e77250837b3f929bffcc1f67addf5e3ba5ee218c3a7b0519 post_install() { vlicense LICENSE diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template index fd06085075c..70f22b913d5 100644 --- a/srcpkgs/mk-configure/template +++ b/srcpkgs/mk-configure/template @@ -1,6 +1,6 @@ # Template file for 'mk-configure' pkgname=mk-configure -version=0.39.4 +version=0.40.0 revision=1 build_style=gnu-makefile make_cmd=bmake @@ -14,7 +14,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause, BSD-3-Clause" homepage="https://github.com/cheusov/mk-configure/" distfiles="https://github.com/cheusov/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=2bf7e95e6923ff3e79faced67169f616a83f27f6f68849b6f00badee3a6474f7 +checksum=7daaa79467389cd3bb7875ad24d0e56ba460b8f6165e138eb222620caf67f903 disable_parallel_build=yes case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index e72d5415267..3e0062ad77a 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,6 +1,6 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=87.0 +version=88.0 revision=1 build_style=gnu-configure build_helper="qmake6" @@ -16,7 +16,7 @@ license="GPL-2.0-only" homepage="https://mkvtoolnix.download" changelog="https://mkvtoolnix.download/doc/NEWS.md" distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz" -checksum=01cdfcbe01d9a771da4d475ed44d882a97695d08b6939684cebf56231bdee820 +checksum=f2f08c0100740668ef8aba7953fe4aed8c04ee6a5b51717816a4b3d529df0a25 if [ "$CROSS_BUILD" ]; then configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/mlir19 b/srcpkgs/mlir19 new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/mlir19 @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/mlir19-devel b/srcpkgs/mlir19-devel new file mode 120000 index 00000000000..985027fe0a5 --- /dev/null +++ b/srcpkgs/mlir19-devel @@ -0,0 +1 @@ +llvm19 \ No newline at end of file diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template index 734290b1c72..99f00658481 100644 --- a/srcpkgs/moar/template +++ b/srcpkgs/moar/template @@ -1,6 +1,6 @@ # Template file for 'moar' pkgname=moar -version=1.26.0 +version=1.28.2 revision=1 build_style=go go_import_path=github.com/walles/moar @@ -11,7 +11,7 @@ license="BSD-2-Clause" homepage="https://github.com/walles/moar" changelog="https://github.com/walles/moar/releases" distfiles="https://github.com/walles/moar/archive/refs/tags/v${version}.tar.gz" -checksum=d08bbc7340abb149d9651062ed8c3710bd18c16457fd7597f4cbaedefa2be1b5 +checksum=4b36c8e74d06c360f241af3de90bbe43ab6e6585b7cddfe8723e3c6723907a56 conflicts="MoarVM" post_install() { diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template index 96d496e14d2..3deef3ad7ac 100644 --- a/srcpkgs/mobile-config-firefox/template +++ b/srcpkgs/mobile-config-firefox/template @@ -1,6 +1,6 @@ # Template file for 'mobile-config-firefox' pkgname=mobile-config-firefox -version=4.0.3 +version=4.3.2 revision=1 build_style=gnu-makefile short_desc="Mobile and privacy friendly configuration for Firefox" @@ -8,4 +8,4 @@ maintainer="Jami Kettunen " license="MPL-2.0" homepage="https://gitlab.com/postmarketOS/mobile-config-firefox" distfiles="https://gitlab.com/postmarketOS/mobile-config-firefox/-/archive/${version}.tar.gz" -checksum=abca765545262e5719f8aa8f5886e7b6ae7da296b090f80c6de25d0b3d6c4da4 +checksum=22b571bf2706d76d7568eb1b41db7934b760bea0f188d6e4668acb4b777ad54b diff --git a/srcpkgs/mold/patches/test-target-machine.patch b/srcpkgs/mold/patches/test-target-machine.patch index acaefb7cdb2..0685b69508f 100644 --- a/srcpkgs/mold/patches/test-target-machine.patch +++ b/srcpkgs/mold/patches/test-target-machine.patch @@ -1,10 +1,8 @@ Allow tests to run when targeting i686 on a host where uname -m returns x86_64. -diff --git a/test/elf/common.inc b/test/elf/common.inc -index 8d5407a827f..8299c1dd7ac 100644 ---- a/test/elf/common.inc -+++ b/test/elf/common.inc -@@ -14,7 +14,9 @@ canonical_name() { +--- a/test/common.inc.orig 2024-11-07 22:51:15.382530584 +0100 ++++ b/test/common.inc 2024-11-07 22:52:49.415441555 +0100 +@@ -15,7 +15,9 @@ canonical_name() { esac } diff --git a/srcpkgs/mold/template b/srcpkgs/mold/template index 1e65558610d..29489f8e568 100644 --- a/srcpkgs/mold/template +++ b/srcpkgs/mold/template @@ -1,6 +1,6 @@ # Template file for 'mold' pkgname=mold -version=2.33.0 +version=2.34.1 revision=1 build_style=cmake configure_args="-DMOLD_USE_SYSTEM_MIMALLOC=ON -DMOLD_USE_SYSTEM_TBB=ON" @@ -14,7 +14,7 @@ license="MIT" homepage="https://github.com/rui314/mold" changelog="https://github.com/rui314/mold/releases" distfiles="https://github.com/rui314/mold/archive/refs/tags/v${version}.tar.gz" -checksum=37b3aacbd9b6accf581b92ba1a98ca418672ae330b78fe56ae542c2dcb10a155 +checksum=a8cf638045b4a4b2697d0bcc77fd96eae93d54d57ad3021bf03b0333a727a59d post_install() { vlicense LICENSE diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template index f7005eaab58..fc34244ce9f 100644 --- a/srcpkgs/mongo-c-driver/template +++ b/srcpkgs/mongo-c-driver/template @@ -1,6 +1,6 @@ # Template file for 'mongo-c-driver' pkgname=mongo-c-driver -version=1.28.1 +version=1.29.0 revision=1 build_style=cmake configure_args="-DENABLE_TESTS=OFF" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://mongoc.org" distfiles="https://github.com/mongodb/mongo-c-driver/archive/${version}.tar.gz" -checksum=249fd66d8d12aac2aec7dea1456e1bf24908c87971016c391a1a82a636029a87 +checksum=507414795dfb24ddf1a418b155b57459d8cea1191c7f0fcd8b826acf5400343c pre_configure() { echo "${version}" > VERSION_CURRENT diff --git a/srcpkgs/mpdevil b/srcpkgs/mpdevil new file mode 120000 index 00000000000..f0c67914773 --- /dev/null +++ b/srcpkgs/mpdevil @@ -0,0 +1 @@ +plattenalbum \ No newline at end of file diff --git a/srcpkgs/mpdevil/template b/srcpkgs/mpdevil/template deleted file mode 100644 index afc46e25524..00000000000 --- a/srcpkgs/mpdevil/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'mpdevil' -pkgname=mpdevil -version=2.1.1 -revision=1 -build_style=meson -hostmakedepends="gettext pkg-config glib-devel gtk-update-icon-cache desktop-file-utils" -depends="python3-mpd2 python3-gobject gtk+3" -short_desc="Simple music browser for MPD" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="https://github.com/SoongNoonien/mpdevil/" -distfiles="https://github.com/SoongNoonien/mpdevil/archive/refs/tags/v$version.tar.gz" -checksum=e51678a7eb7a06a2a2858f3e1e2743ad8b535dc1d97d8b58351096bb807fec9c diff --git a/srcpkgs/msitools-devel b/srcpkgs/msitools-devel new file mode 120000 index 00000000000..baf6b8d3f07 --- /dev/null +++ b/srcpkgs/msitools-devel @@ -0,0 +1 @@ +msitools \ No newline at end of file diff --git a/srcpkgs/msitools/template b/srcpkgs/msitools/template new file mode 100644 index 00000000000..7cbefc4b462 --- /dev/null +++ b/srcpkgs/msitools/template @@ -0,0 +1,41 @@ +# Template file for 'msitools' +pkgname=msitools +version=0.103 +revision=1 +build_style=meson +build_helper=gir +hostmakedepends="gettext glib-devel pkg-config bison vala" +makedepends="glib-devel libgsf-devel gcab-devel" +depends="bash perl" +short_desc="Inspect and build Windows Installer (.MSI) files" +maintainer="Piraty " +license="GPL-2.0-or-later" +homepage="https://wiki.gnome.org/msitools" +changelog="https://gitlab.gnome.org/GNOME/msitools/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" +checksum=d17622eebbf37fa4c09b59be0bc8db08b26be300a6731c74da1ebce262bce839 + +post_extract() { + # perl is runtime depedency of msidiff + vsed -i meson.build -e '/perl = find_program/d' +} + +libmsitools_package() { + short_desc+=" - runtime library" + license="LGPL-2.1-or-later" + pkg_install() { + vmove usr/lib/*.so.* + } +} + +msitools-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/gir-1.0 + vmove usr/share/vala + } +} diff --git a/srcpkgs/musl/patches/pthread_0001-deduplicate-TP_ADJ-logic-out-of-each-arch-replace-wi.patch b/srcpkgs/musl/patches/pthread_0001-deduplicate-TP_ADJ-logic-out-of-each-arch-replace-wi.patch new file mode 100644 index 00000000000..61f5e8482d8 --- /dev/null +++ b/srcpkgs/musl/patches/pthread_0001-deduplicate-TP_ADJ-logic-out-of-each-arch-replace-wi.patch @@ -0,0 +1,255 @@ +From ea71a9004e08030a15d45186e263fd2b0c51cc25 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Mon, 24 Aug 2020 22:04:52 -0400 +Subject: [PATCH 3/5] deduplicate TP_ADJ logic out of each arch, replace with + TP_OFFSET + +the only part of TP_ADJ that was not uniquely determined by +TLS_ABOVE_TP was the 0x7000 adjustment used mainly on mips and powerpc +variants. +--- + arch/aarch64/pthread_arch.h | 1 - + arch/arm/pthread_arch.h | 1 - + arch/i386/pthread_arch.h | 2 -- + arch/m68k/pthread_arch.h | 2 +- + arch/microblaze/pthread_arch.h | 2 -- + arch/mips/pthread_arch.h | 2 +- + arch/mips64/pthread_arch.h | 2 +- + arch/mipsn32/pthread_arch.h | 2 +- + arch/or1k/pthread_arch.h | 1 - + arch/powerpc/pthread_arch.h | 2 +- + arch/powerpc64/pthread_arch.h | 2 +- + arch/riscv64/pthread_arch.h | 1 - + arch/s390x/pthread_arch.h | 2 -- + arch/sh/pthread_arch.h | 1 - + arch/x32/pthread_arch.h | 2 -- + arch/x86_64/pthread_arch.h | 2 -- + src/internal/pthread_impl.h | 10 ++++++++++ + 17 files changed, 16 insertions(+), 21 deletions(-) + +diff --git a/arch/aarch64/pthread_arch.h b/arch/aarch64/pthread_arch.h +index e64b126d..f3c005c7 100644 +--- a/arch/aarch64/pthread_arch.h ++++ b/arch/aarch64/pthread_arch.h +@@ -7,6 +7,5 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 16 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) + + #define MC_PC pc +diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h +index e689ea21..48640985 100644 +--- a/arch/arm/pthread_arch.h ++++ b/arch/arm/pthread_arch.h +@@ -28,6 +28,5 @@ static inline pthread_t __pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 8 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) + + #define MC_PC arm_pc +diff --git a/arch/i386/pthread_arch.h b/arch/i386/pthread_arch.h +index 6f600b9e..32570a17 100644 +--- a/arch/i386/pthread_arch.h ++++ b/arch/i386/pthread_arch.h +@@ -5,6 +5,4 @@ static inline struct pthread *__pthread_self() + return self; + } + +-#define TP_ADJ(p) (p) +- + #define MC_PC gregs[REG_EIP] +diff --git a/arch/m68k/pthread_arch.h b/arch/m68k/pthread_arch.h +index 02d5b8a0..7c9990c2 100644 +--- a/arch/m68k/pthread_arch.h ++++ b/arch/m68k/pthread_arch.h +@@ -6,8 +6,8 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) + ++#define TP_OFFSET 0x7000 + #define DTP_OFFSET 0x8000 + + #define MC_PC gregs[R_PC] +diff --git a/arch/microblaze/pthread_arch.h b/arch/microblaze/pthread_arch.h +index f6ba8de9..c327f4eb 100644 +--- a/arch/microblaze/pthread_arch.h ++++ b/arch/microblaze/pthread_arch.h +@@ -5,6 +5,4 @@ static inline struct pthread *__pthread_self() + return self; + } + +-#define TP_ADJ(p) (p) +- + #define MC_PC regs.pc +diff --git a/arch/mips/pthread_arch.h b/arch/mips/pthread_arch.h +index 1e7839ea..c22eb34d 100644 +--- a/arch/mips/pthread_arch.h ++++ b/arch/mips/pthread_arch.h +@@ -12,8 +12,8 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) + ++#define TP_OFFSET 0x7000 + #define DTP_OFFSET 0x8000 + + #define MC_PC pc +diff --git a/arch/mips64/pthread_arch.h b/arch/mips64/pthread_arch.h +index 1e7839ea..c22eb34d 100644 +--- a/arch/mips64/pthread_arch.h ++++ b/arch/mips64/pthread_arch.h +@@ -12,8 +12,8 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) + ++#define TP_OFFSET 0x7000 + #define DTP_OFFSET 0x8000 + + #define MC_PC pc +diff --git a/arch/mipsn32/pthread_arch.h b/arch/mipsn32/pthread_arch.h +index 1e7839ea..c22eb34d 100644 +--- a/arch/mipsn32/pthread_arch.h ++++ b/arch/mipsn32/pthread_arch.h +@@ -12,8 +12,8 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) + ++#define TP_OFFSET 0x7000 + #define DTP_OFFSET 0x8000 + + #define MC_PC pc +diff --git a/arch/or1k/pthread_arch.h b/arch/or1k/pthread_arch.h +index 1b806f89..76d0a8bc 100644 +--- a/arch/or1k/pthread_arch.h ++++ b/arch/or1k/pthread_arch.h +@@ -13,6 +13,5 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) + + #define MC_PC regs.pc +diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h +index ae0f28d6..9697046b 100644 +--- a/arch/powerpc/pthread_arch.h ++++ b/arch/powerpc/pthread_arch.h +@@ -7,8 +7,8 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) + ++#define TP_OFFSET 0x7000 + #define DTP_OFFSET 0x8000 + + // the kernel calls the ip "nip", it's the first saved value after the 32 +diff --git a/arch/powerpc64/pthread_arch.h b/arch/powerpc64/pthread_arch.h +index 79c3ecd8..e9dba43f 100644 +--- a/arch/powerpc64/pthread_arch.h ++++ b/arch/powerpc64/pthread_arch.h +@@ -7,8 +7,8 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) + ++#define TP_OFFSET 0x7000 + #define DTP_OFFSET 0x8000 + + // the kernel calls the ip "nip", it's the first saved value after the 32 +diff --git a/arch/riscv64/pthread_arch.h b/arch/riscv64/pthread_arch.h +index db414b17..50f0868d 100644 +--- a/arch/riscv64/pthread_arch.h ++++ b/arch/riscv64/pthread_arch.h +@@ -7,7 +7,6 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 0 +-#define TP_ADJ(p) ((char *)p + sizeof(struct pthread)) + + #define DTP_OFFSET 0x800 + +diff --git a/arch/s390x/pthread_arch.h b/arch/s390x/pthread_arch.h +index e2251f1f..5d22546b 100644 +--- a/arch/s390x/pthread_arch.h ++++ b/arch/s390x/pthread_arch.h +@@ -9,6 +9,4 @@ static inline struct pthread *__pthread_self() + return self; + } + +-#define TP_ADJ(p) (p) +- + #define MC_PC psw.addr +diff --git a/arch/sh/pthread_arch.h b/arch/sh/pthread_arch.h +index 3ee9c1a9..c2252908 100644 +--- a/arch/sh/pthread_arch.h ++++ b/arch/sh/pthread_arch.h +@@ -7,7 +7,6 @@ static inline struct pthread *__pthread_self() + + #define TLS_ABOVE_TP + #define GAP_ABOVE_TP 8 +-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) + + #define MC_PC sc_pc + +diff --git a/arch/x32/pthread_arch.h b/arch/x32/pthread_arch.h +index f640a1a1..fa452839 100644 +--- a/arch/x32/pthread_arch.h ++++ b/arch/x32/pthread_arch.h +@@ -5,8 +5,6 @@ static inline struct pthread *__pthread_self() + return self; + } + +-#define TP_ADJ(p) (p) +- + #define MC_PC gregs[REG_RIP] + + #define CANARY canary2 +diff --git a/arch/x86_64/pthread_arch.h b/arch/x86_64/pthread_arch.h +index 65e880c6..1c64a840 100644 +--- a/arch/x86_64/pthread_arch.h ++++ b/arch/x86_64/pthread_arch.h +@@ -5,6 +5,4 @@ static inline struct pthread *__pthread_self() + return self; + } + +-#define TP_ADJ(p) (p) +- + #define MC_PC gregs[REG_RIP] +diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h +index 5749a336..3c2bd767 100644 +--- a/src/internal/pthread_impl.h ++++ b/src/internal/pthread_impl.h +@@ -105,10 +105,20 @@ struct __timer { + #define CANARY canary + #endif + ++#ifndef TP_OFFSET ++#define TP_OFFSET 0 ++#endif ++ + #ifndef DTP_OFFSET + #define DTP_OFFSET 0 + #endif + ++#ifdef TLS_ABOVE_TP ++#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + TP_OFFSET) ++#else ++#define TP_ADJ(p) (p) ++#endif ++ + #ifndef tls_mod_off_t + #define tls_mod_off_t size_t + #endif +-- +2.47.0 + diff --git a/srcpkgs/musl/patches/pthread_0002-deduplicate-__pthread_self-thread-pointer-adjustment.patch b/srcpkgs/musl/patches/pthread_0002-deduplicate-__pthread_self-thread-pointer-adjustment.patch new file mode 100644 index 00000000000..cdc62a054db --- /dev/null +++ b/srcpkgs/musl/patches/pthread_0002-deduplicate-__pthread_self-thread-pointer-adjustment.patch @@ -0,0 +1,368 @@ +From 3a5b9ae7cf656648c80fe155a5239d9b4fb4c485 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Mon, 24 Aug 2020 22:23:08 -0400 +Subject: [PATCH 1/2] deduplicate __pthread_self thread pointer adjustment out + of each arch + +the adjustment made is entirely a function of TLS_ABOVE_TP and +TP_OFFSET. aside from avoiding repetition of the TP_OFFSET value and +arithmetic, this change makes pthread_arch.h independent of the +definition of struct __pthread from pthread_impl.h. this in turn will +allow inclusion of pthread_arch.h to be moved to the top of +pthread_impl.h so that it can influence the definition of the +structure. + +previously, arch files were very inconsistent about the type used for +the thread pointer. this change unifies the new __get_tp interface to +always use uintptr_t, which is the most correct when performing +arithmetic that may involve addresses outside the actual pointed-to +object (due to TP_OFFSET). +--- + arch/aarch64/pthread_arch.h | 8 ++++---- + arch/arm/pthread_arch.h | 16 ++++++++-------- + arch/i386/pthread_arch.h | 8 ++++---- + arch/m68k/pthread_arch.h | 5 ++--- + arch/microblaze/pthread_arch.h | 8 ++++---- + arch/mips/pthread_arch.h | 8 ++++---- + arch/mips64/pthread_arch.h | 8 ++++---- + arch/mipsn32/pthread_arch.h | 8 ++++---- + arch/or1k/pthread_arch.h | 9 ++++----- + arch/powerpc/pthread_arch.h | 6 +++--- + arch/powerpc64/pthread_arch.h | 6 +++--- + arch/riscv64/pthread_arch.h | 6 +++--- + arch/s390x/pthread_arch.h | 8 ++++---- + arch/sh/pthread_arch.h | 8 ++++---- + arch/x32/pthread_arch.h | 8 ++++---- + arch/x86_64/pthread_arch.h | 8 ++++---- + src/internal/pthread_impl.h | 2 ++ + 17 files changed, 65 insertions(+), 65 deletions(-) + +diff --git a/arch/aarch64/pthread_arch.h b/arch/aarch64/pthread_arch.h +index f3c005c7..3909616c 100644 +--- a/arch/aarch64/pthread_arch.h ++++ b/arch/aarch64/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- char *self; +- __asm__ ("mrs %0,tpidr_el0" : "=r"(self)); +- return (void*)(self - sizeof(struct pthread)); ++ uintptr_t tp; ++ __asm__ ("mrs %0,tpidr_el0" : "=r"(tp)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h +index 48640985..157e2eae 100644 +--- a/arch/arm/pthread_arch.h ++++ b/arch/arm/pthread_arch.h +@@ -1,11 +1,11 @@ + #if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \ + || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7 + +-static inline pthread_t __pthread_self() ++static inline uintptr_t __get_tp() + { +- char *p; +- __asm__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(p) ); +- return (void *)(p-sizeof(struct pthread)); ++ uintptr_t tp; ++ __asm__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(tp) ); ++ return tp; + } + + #else +@@ -16,12 +16,12 @@ static inline pthread_t __pthread_self() + #define BLX "blx" + #endif + +-static inline pthread_t __pthread_self() ++static inline uintptr_t __get_tp() + { + extern hidden uintptr_t __a_gettp_ptr; +- register uintptr_t p __asm__("r0"); +- __asm__ ( BLX " %1" : "=r"(p) : "r"(__a_gettp_ptr) : "cc", "lr" ); +- return (void *)(p-sizeof(struct pthread)); ++ register uintptr_t tp __asm__("r0"); ++ __asm__ ( BLX " %1" : "=r"(tp) : "r"(__a_gettp_ptr) : "cc", "lr" ); ++ return tp; + } + + #endif +diff --git a/arch/i386/pthread_arch.h b/arch/i386/pthread_arch.h +index 32570a17..a639c382 100644 +--- a/arch/i386/pthread_arch.h ++++ b/arch/i386/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- struct pthread *self; +- __asm__ ("movl %%gs:0,%0" : "=r" (self) ); +- return self; ++ uintptr_t tp; ++ __asm__ ("movl %%gs:0,%0" : "=r" (tp) ); ++ return tp; + } + + #define MC_PC gregs[REG_EIP] +diff --git a/arch/m68k/pthread_arch.h b/arch/m68k/pthread_arch.h +index 7c9990c2..5bea4e1a 100644 +--- a/arch/m68k/pthread_arch.h ++++ b/arch/m68k/pthread_arch.h +@@ -1,7 +1,6 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- uintptr_t tp = __syscall(SYS_get_thread_area); +- return (pthread_t)(tp - 0x7000 - sizeof(struct pthread)); ++ return __syscall(SYS_get_thread_area); + } + + #define TLS_ABOVE_TP +diff --git a/arch/microblaze/pthread_arch.h b/arch/microblaze/pthread_arch.h +index c327f4eb..ff26624e 100644 +--- a/arch/microblaze/pthread_arch.h ++++ b/arch/microblaze/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- struct pthread *self; +- __asm__ ("ori %0, r21, 0" : "=r" (self) ); +- return self; ++ uintptr_t tp; ++ __asm__ ("ori %0, r21, 0" : "=r" (tp) ); ++ return tp; + } + + #define MC_PC regs.pc +diff --git a/arch/mips/pthread_arch.h b/arch/mips/pthread_arch.h +index c22eb34d..c45347ab 100644 +--- a/arch/mips/pthread_arch.h ++++ b/arch/mips/pthread_arch.h +@@ -1,13 +1,13 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { + #if __mips_isa_rev < 2 +- register char *tp __asm__("$3"); ++ register uintptr_t tp __asm__("$3"); + __asm__ (".word 0x7c03e83b" : "=r" (tp) ); + #else +- char *tp; ++ uintptr_t tp; + __asm__ ("rdhwr %0, $29" : "=r" (tp) ); + #endif +- return (pthread_t)(tp - 0x7000 - sizeof(struct pthread)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/mips64/pthread_arch.h b/arch/mips64/pthread_arch.h +index c22eb34d..c45347ab 100644 +--- a/arch/mips64/pthread_arch.h ++++ b/arch/mips64/pthread_arch.h +@@ -1,13 +1,13 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { + #if __mips_isa_rev < 2 +- register char *tp __asm__("$3"); ++ register uintptr_t tp __asm__("$3"); + __asm__ (".word 0x7c03e83b" : "=r" (tp) ); + #else +- char *tp; ++ uintptr_t tp; + __asm__ ("rdhwr %0, $29" : "=r" (tp) ); + #endif +- return (pthread_t)(tp - 0x7000 - sizeof(struct pthread)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/mipsn32/pthread_arch.h b/arch/mipsn32/pthread_arch.h +index c22eb34d..c45347ab 100644 +--- a/arch/mipsn32/pthread_arch.h ++++ b/arch/mipsn32/pthread_arch.h +@@ -1,13 +1,13 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { + #if __mips_isa_rev < 2 +- register char *tp __asm__("$3"); ++ register uintptr_t tp __asm__("$3"); + __asm__ (".word 0x7c03e83b" : "=r" (tp) ); + #else +- char *tp; ++ uintptr_t tp; + __asm__ ("rdhwr %0, $29" : "=r" (tp) ); + #endif +- return (pthread_t)(tp - 0x7000 - sizeof(struct pthread)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/or1k/pthread_arch.h b/arch/or1k/pthread_arch.h +index 76d0a8bc..f75ea7e4 100644 +--- a/arch/or1k/pthread_arch.h ++++ b/arch/or1k/pthread_arch.h +@@ -1,14 +1,13 @@ +-/* or1k use variant I, but with the twist that tp points to the end of TCB */ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { + #ifdef __clang__ +- char *tp; ++ uintptr_t tp; + __asm__ ("l.ori %0, r10, 0" : "=r" (tp) ); + #else +- register char *tp __asm__("r10"); ++ register uintptr_t tp __asm__("r10"); + __asm__ ("" : "=r" (tp) ); + #endif +- return (struct pthread *) (tp - sizeof(struct pthread)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h +index 9697046b..a0947763 100644 +--- a/arch/powerpc/pthread_arch.h ++++ b/arch/powerpc/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- register char *tp __asm__("r2"); ++ register uintptr_t tp __asm__("r2"); + __asm__ ("" : "=r" (tp) ); +- return (pthread_t)(tp - 0x7000 - sizeof(struct pthread)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/powerpc64/pthread_arch.h b/arch/powerpc64/pthread_arch.h +index e9dba43f..08a557d2 100644 +--- a/arch/powerpc64/pthread_arch.h ++++ b/arch/powerpc64/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- register char *tp __asm__("r13"); ++ register uintptr_t tp __asm__("r13"); + __asm__ ("" : "=r" (tp) ); +- return (pthread_t)(tp - 0x7000 - sizeof(struct pthread)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/riscv64/pthread_arch.h b/arch/riscv64/pthread_arch.h +index 50f0868d..a20d7fba 100644 +--- a/arch/riscv64/pthread_arch.h ++++ b/arch/riscv64/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- char *tp; ++ uintptr_t tp; + __asm__ __volatile__("mv %0, tp" : "=r"(tp)); +- return (void *)(tp - sizeof(struct pthread)); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/s390x/pthread_arch.h b/arch/s390x/pthread_arch.h +index 5d22546b..e54fec3f 100644 +--- a/arch/s390x/pthread_arch.h ++++ b/arch/s390x/pthread_arch.h +@@ -1,12 +1,12 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- struct pthread *self; ++ uintptr_t tp; + __asm__ ( + "ear %0, %%a0\n" + "sllg %0, %0, 32\n" + "ear %0, %%a1\n" +- : "=r"(self)); +- return self; ++ : "=r"(tp)); ++ return tp; + } + + #define MC_PC psw.addr +diff --git a/arch/sh/pthread_arch.h b/arch/sh/pthread_arch.h +index c2252908..0fcf70d2 100644 +--- a/arch/sh/pthread_arch.h ++++ b/arch/sh/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- char *self; +- __asm__ ("stc gbr,%0" : "=r" (self) ); +- return (struct pthread *) (self - sizeof(struct pthread)); ++ uintptr_t tp; ++ __asm__ ("stc gbr,%0" : "=r" (tp) ); ++ return tp; + } + + #define TLS_ABOVE_TP +diff --git a/arch/x32/pthread_arch.h b/arch/x32/pthread_arch.h +index fa452839..6e2495da 100644 +--- a/arch/x32/pthread_arch.h ++++ b/arch/x32/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- struct pthread *self; +- __asm__ ("mov %%fs:0,%0" : "=r" (self) ); +- return self; ++ uintptr_t tp; ++ __asm__ ("mov %%fs:0,%0" : "=r" (tp) ); ++ return tp; + } + + #define MC_PC gregs[REG_RIP] +diff --git a/arch/x86_64/pthread_arch.h b/arch/x86_64/pthread_arch.h +index 1c64a840..c8c63f2e 100644 +--- a/arch/x86_64/pthread_arch.h ++++ b/arch/x86_64/pthread_arch.h +@@ -1,8 +1,8 @@ +-static inline struct pthread *__pthread_self() ++static inline uintptr_t __get_tp() + { +- struct pthread *self; +- __asm__ ("mov %%fs:0,%0" : "=r" (self) ); +- return self; ++ uintptr_t tp; ++ __asm__ ("mov %%fs:0,%0" : "=r" (tp) ); ++ return tp; + } + + #define MC_PC gregs[REG_RIP] +diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h +index 3c2bd767..58e06136 100644 +--- a/src/internal/pthread_impl.h ++++ b/src/internal/pthread_impl.h +@@ -115,8 +115,10 @@ struct __timer { + + #ifdef TLS_ABOVE_TP + #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + TP_OFFSET) ++#define __pthread_self() ((pthread_t)(__get_tp() - sizeof(struct __pthread) - TP_OFFSET)) + #else + #define TP_ADJ(p) (p) ++#define __pthread_self() ((pthread_t)__get_tp()) + #endif + + #ifndef tls_mod_off_t +-- +2.47.0 + diff --git a/srcpkgs/musl/patches/pthread_0003-remove-redundant-pthread-struct-members-repeated-for.patch b/srcpkgs/musl/patches/pthread_0003-remove-redundant-pthread-struct-members-repeated-for.patch new file mode 100644 index 00000000000..f0616241933 --- /dev/null +++ b/srcpkgs/musl/patches/pthread_0003-remove-redundant-pthread-struct-members-repeated-for.patch @@ -0,0 +1,165 @@ +From 57f6e85c9de417fef5eece2a5b00c1104321f543 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Mon, 24 Aug 2020 22:45:51 -0400 +Subject: [PATCH 2/2] remove redundant pthread struct members repeated for + layout purposes + +dtv_copy, canary2, and canary_at_end existed solely to match multiple +ABI and asm-accessed layouts simultaneously. now that pthread_arch.h +can be included before struct __pthread is defined, the struct layout +can depend on macros defined by pthread_arch.h. +--- + arch/powerpc/pthread_arch.h | 2 -- + arch/powerpc64/pthread_arch.h | 2 -- + arch/x32/pthread_arch.h | 2 +- + ldso/dynlink.c | 2 +- + src/env/__init_tls.c | 2 +- + src/env/__stack_chk_fail.c | 2 +- + src/internal/pthread_impl.h | 23 ++++++++++++++--------- + src/thread/pthread_create.c | 2 +- + 8 files changed, 19 insertions(+), 18 deletions(-) + +diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h +index a0947763..42e88b07 100644 +--- a/arch/powerpc/pthread_arch.h ++++ b/arch/powerpc/pthread_arch.h +@@ -14,5 +14,3 @@ static inline uintptr_t __get_tp() + // the kernel calls the ip "nip", it's the first saved value after the 32 + // GPRs. + #define MC_PC gregs[32] +- +-#define CANARY canary_at_end +diff --git a/arch/powerpc64/pthread_arch.h b/arch/powerpc64/pthread_arch.h +index 08a557d2..1b7b9079 100644 +--- a/arch/powerpc64/pthread_arch.h ++++ b/arch/powerpc64/pthread_arch.h +@@ -14,5 +14,3 @@ static inline uintptr_t __get_tp() + // the kernel calls the ip "nip", it's the first saved value after the 32 + // GPRs. + #define MC_PC gp_regs[32] +- +-#define CANARY canary_at_end +diff --git a/arch/x32/pthread_arch.h b/arch/x32/pthread_arch.h +index 6e2495da..c1e7716d 100644 +--- a/arch/x32/pthread_arch.h ++++ b/arch/x32/pthread_arch.h +@@ -7,6 +7,6 @@ static inline uintptr_t __get_tp() + + #define MC_PC gregs[REG_RIP] + +-#define CANARY canary2 ++#define CANARY_PAD + + #define tls_mod_off_t unsigned long long +diff --git a/ldso/dynlink.c b/ldso/dynlink.c +index d3d4ddd2..f7474743 100644 +--- a/ldso/dynlink.c ++++ b/ldso/dynlink.c +@@ -1579,7 +1579,7 @@ static void install_new_tls(void) + + /* Install new dtv for each thread. */ + for (j=0, td=self; !j || td!=self; j++, td=td->next) { +- td->dtv = td->dtv_copy = newdtv[j]; ++ td->dtv = newdtv[j]; + } + + __tl_unlock(); +diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c +index 772baba3..a93141ed 100644 +--- a/src/env/__init_tls.c ++++ b/src/env/__init_tls.c +@@ -67,7 +67,7 @@ void *__copy_tls(unsigned char *mem) + } + #endif + dtv[0] = libc.tls_cnt; +- td->dtv = td->dtv_copy = dtv; ++ td->dtv = dtv; + return td; + } + +diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c +index e32596d1..bf5a280a 100644 +--- a/src/env/__stack_chk_fail.c ++++ b/src/env/__stack_chk_fail.c +@@ -9,7 +9,7 @@ void __init_ssp(void *entropy) + if (entropy) memcpy(&__stack_chk_guard, entropy, sizeof(uintptr_t)); + else __stack_chk_guard = (uintptr_t)&__stack_chk_guard * 1103515245; + +- __pthread_self()->CANARY = __stack_chk_guard; ++ __pthread_self()->canary = __stack_chk_guard; + } + + void __stack_chk_fail(void) +diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h +index 58e06136..4d709bbc 100644 +--- a/src/internal/pthread_impl.h ++++ b/src/internal/pthread_impl.h +@@ -11,16 +11,25 @@ + #include "atomic.h" + #include "futex.h" + ++#include "pthread_arch.h" ++ + #define pthread __pthread + + struct pthread { + /* Part 1 -- these fields may be external or + * internal (accessed via asm) ABI. Do not change. */ + struct pthread *self; ++#ifndef TLS_ABOVE_TP + uintptr_t *dtv; ++#endif + struct pthread *prev, *next; /* non-ABI */ + uintptr_t sysinfo; +- uintptr_t canary, canary2; ++#ifndef TLS_ABOVE_TP ++#ifdef CANARY_PAD ++ uintptr_t canary_pad; ++#endif ++ uintptr_t canary; ++#endif + + /* Part 2 -- implementation details, non-ABI. */ + int tid; +@@ -52,8 +61,10 @@ struct pthread { + + /* Part 3 -- the positions of these fields relative to + * the end of the structure is external and internal ABI. */ +- uintptr_t canary_at_end; +- uintptr_t *dtv_copy; ++#ifdef TLS_ABOVE_TP ++ uintptr_t canary; ++ uintptr_t *dtv; ++#endif + }; + + enum { +@@ -99,12 +110,6 @@ struct __timer { + #define _b_waiters2 __u.__vi[4] + #define _b_inst __u.__p[3] + +-#include "pthread_arch.h" +- +-#ifndef CANARY +-#define CANARY canary +-#endif +- + #ifndef TP_OFFSET + #define TP_OFFSET 0 + #endif +diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c +index 10f1b7d8..55744155 100644 +--- a/src/thread/pthread_create.c ++++ b/src/thread/pthread_create.c +@@ -314,7 +314,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att + new->detach_state = DT_JOINABLE; + } + new->robust_list.head = &new->robust_list.head; +- new->CANARY = self->CANARY; ++ new->canary = self->canary; + new->sysinfo = self->sysinfo; + + /* Setup argument structure for the new thread on its stack. +-- +2.47.0 + diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 02a1f4e02a5..66e5cf056e9 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -2,7 +2,7 @@ pkgname=musl reverts="1.2.0_1" version=1.1.24 -revision=21 +revision=22 archs="*-musl" bootstrap=yes build_style=gnu-configure diff --git a/srcpkgs/n/template b/srcpkgs/n/template index 44f2582fc4f..d6d798424b3 100644 --- a/srcpkgs/n/template +++ b/srcpkgs/n/template @@ -1,6 +1,6 @@ # Template file for 'n' pkgname=n -version=10.0.0 +version=10.1.0 revision=1 build_style=gnu-makefile depends="curl tar" @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/tj/n" changelog="https://raw.githubusercontent.com/tj/n/master/CHANGELOG.md" distfiles="https://github.com/tj/n/archive/refs/tags/v${version}.tar.gz" -checksum=096b78d1ccb4ad006293ed1e2b258925d99565449d374f5745ee374dc6f07a23 +checksum=53f686808ef37728922ad22e8a5560f4caf1d214d706639ef8eca6e72b891697 do_install() { vbin bin/n diff --git a/srcpkgs/neomutt/patches/disable-failing-test.patch b/srcpkgs/neomutt/patches/disable-failing-test.patch new file mode 100644 index 00000000000..6d5fe81de6e --- /dev/null +++ b/srcpkgs/neomutt/patches/disable-failing-test.patch @@ -0,0 +1,40 @@ +mutt_path_to_absolute.c:102: Check test_check_str_eq... failed + +--- a/test/Makefile.autosetup ++++ b/test/Makefile.autosetup +@@ -88,7 +88,6 @@ + test/buffer/buf_new.o \ + test/buffer/buf_printf.o \ + test/buffer/buf_reset.o \ +- test/buffer/buf_rfind.o \ + test/buffer/buf_seek.o \ + test/buffer/buf_startswith.o \ + test/buffer/buf_strcpy.o \ +@@ -507,8 +506,7 @@ + test/path/mutt_path_tidy.o \ + test/path/mutt_path_tidy_dotdot.o \ + test/path/mutt_path_tidy_slash.o \ +- test/path/mutt_path_tilde.o \ +- test/path/mutt_path_to_absolute.o ++ test/path/mutt_path_tilde.o + + PATTERN_OBJS = pattern/pattern.o \ + test/pattern/comp.o \ +--- a/test/main.c ++++ b/test/main.c +@@ -131,7 +131,6 @@ + NEOMUTT_TEST_ITEM(test_buf_pool_release) \ + NEOMUTT_TEST_ITEM(test_buf_printf) \ + NEOMUTT_TEST_ITEM(test_buf_reset) \ +- NEOMUTT_TEST_ITEM(test_buf_rfind) \ + NEOMUTT_TEST_ITEM(test_buf_seek) \ + NEOMUTT_TEST_ITEM(test_buf_startswith) \ + NEOMUTT_TEST_ITEM(test_buf_strcpy) \ +@@ -555,7 +554,6 @@ + NEOMUTT_TEST_ITEM(test_mutt_path_tidy_dotdot) \ + NEOMUTT_TEST_ITEM(test_mutt_path_tidy_slash) \ + NEOMUTT_TEST_ITEM(test_mutt_path_tilde) \ +- NEOMUTT_TEST_ITEM(test_mutt_path_to_absolute) \ + \ + /* pattern */ \ + NEOMUTT_TEST_ITEM(test_mutt_pattern_comp) \ diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 4139264ca5a..0e70aa33ebb 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,19 +1,20 @@ # Template file for 'neomutt' pkgname=neomutt -version=20240425 +version=20241002 revision=1 create_wrksrc=true build_wrksrc="${pkgname}-${version}" build_style=configure configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl --zlib --tdb - --rocksdb --autocrypt --sqlite" + --rocksdb --autocrypt --sqlite --pcre2 --zstd" make_check_target=test conf_files="/etc/neomuttrc" # neomutt needs either w3m/lynx/elinks to build manual.html hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m pkg-config" makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel rocksdb-devel tdb-devel ncurses-devel libidn2-devel libnotmuch-devel - openssl-devel libsasl-devel lua54-devel zlib-devel sqlite-devel" + openssl-devel libsasl-devel lua54-devel zlib-devel sqlite-devel libzstd-devel + pcre2-devel" depends="mime-types" short_desc="Mutt with misc fixes and feature patches" maintainer="Toyam Cox " @@ -22,9 +23,9 @@ homepage="https://neomutt.org/" _test_files_hash=00efc8388110208e77e6ed9d8294dfc333753d54 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz" -checksum="a5aed0a0f506260997821c23cb148bc5ca4938fd613e0e8b89556f397ffc17f7 +checksum="8d5673d9cc4b239adcf4bc718d372c8c85d0b53248ecd628358625c877a53064 2865e258034a72e498fdd1810071d9ab7559297a5f67203ea163cfdc4192dea4" -python_version=3 +patch_args="-Np1 -d ${build_wrksrc}" # fix: if [ "${XBPS_CROSS_BASE}" ]; then diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 002e68b7594..c2e7e4de0ea 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=11.08.00 +version=11.08.01 revision=1 -_githash=ea0ca6c83af94fed16a0778324fbb31bb498ae5e -_githash_guide=c907dab62741cb648c3e705ef3ecfd7e110f2ba7 +_githash=f729c8566b4622350a1bad2c11eb38cae06c8bc0 +_githash_guide=16fc707f36b9c7e10d40cea4a6dd3402fa2cbc0d create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="flex perl pkg-config python3" @@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm" homepage="http://netpbm.sourceforge.net/" distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="44dfc09faeebbf10447ffa307d5a777e9e25d91b187684b5b77d9576715c232c - 01975597cf72b64af1e9cb60cb027c4299c80f1cde711a1cd3839e2cf26288f3" +checksum="a4298f3a0c357c8528bfa774e603fa9312018a4dc1567b327bb6c201a514f95c + 3fcf78cf2d7896bef2776236d90a54045d31327a06d6520d4ad052e35bef096f" post_extract() { cd $build_wrksrc diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template index 8751d1ecae5..1350202bd71 100644 --- a/srcpkgs/nfdump/template +++ b/srcpkgs/nfdump/template @@ -1,6 +1,6 @@ # Template file for 'nfdump' pkgname=nfdump -version=1.7.4 +version=1.7.5 revision=1 build_style=gnu-configure hostmakedepends="automake flex libtool pkg-config" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://github.com/phaag/nfdump" distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz" -checksum=8cf76ad0b4e3c1e7edf9532ec7508b11f125adcfcdac5010fd7eec8fe792cfd8 +checksum=f7d1df04fe66a173613a13d1b632062150cd63d08ed9299cc2560f519ed33e2e configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd" pre_configure() { diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template index ac323278ebe..8e673bcb233 100644 --- a/srcpkgs/nghttp2/template +++ b/srcpkgs/nghttp2/template @@ -1,6 +1,6 @@ # Template file for 'nghttp2' pkgname=nghttp2 -version=1.63.0 +version=1.64.0 revision=1 build_style=gnu-configure # build system errors out if python isn't available @@ -14,7 +14,7 @@ maintainer="skmpz " license="MIT" homepage="https://nghttp2.org" distfiles="https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz" -checksum=4879c75dd32a74421b9857924449460b8341796c0613ba114ab2188e4622354b +checksum=88bb94c9e4fd1c499967f83dece36a78122af7d5fb40da2019c56b9ccc6eb9dd python_version=3 post_install() { diff --git a/srcpkgs/nickle/template b/srcpkgs/nickle/template index 5dd8e62c2ec..cefe748d080 100644 --- a/srcpkgs/nickle/template +++ b/srcpkgs/nickle/template @@ -1,16 +1,17 @@ # Template file for 'nickle' pkgname=nickle -version=2.97 +version=2.101 revision=1 -build_style=gnu-configure -makedepends="readline-devel" +build_style=meson +hostmakedepends="bc flex pkg-config" +makedepends="gmp-devel readline-devel" short_desc="Powerful desk calculator language" maintainer="Leah Neukirchen " license="MIT" homepage="https://nickle.org/" changelog="https://keithp.com/cgit/nickle.git/log/" -distfiles="https://nickle.org/release/${pkgname}-${version}.tar.gz" -checksum=e2d6434d1216aeec552932828f9aed52f326bd12d8e06cae0f0de4a119d40a3f +distfiles="https://nickle.org/release/${pkgname}-${version}.tar.xz" +checksum=08f12ea1fb68fd76346cce45446a286c47a40ed0996dc93f20d41b2dac5263c5 post_install() { vmkdir usr/share/examples diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template index 7aac2286f89..1730a79c5e4 100644 --- a/srcpkgs/nicotine+/template +++ b/srcpkgs/nicotine+/template @@ -1,15 +1,15 @@ # Template file for 'nicotine+' pkgname=nicotine+ -version=3.3.4 +version=3.3.6 revision=1 build_style=python3-module hostmakedepends="python3-setuptools gettext" depends="gtk4 python3-gobject" -checkdepends="$depends python3-pytest python3-pytest-xvfb" +checkdepends="$depends python3-pytest python3-pytest-xvfb dejavu-fonts-ttf" short_desc="Graphical client for the Soulseek peer-to-peer network" maintainer="doggone " license="GPL-3.0-or-later" homepage="https://nicotine-plus.org" changelog="https://raw.githubusercontent.com/nicotine-plus/nicotine-plus/master/NEWS.md" distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz" -checksum=0286df979e124ef90b335dbd4d992938c76e9ff1c9b654e02feb638a336af358 +checksum=3911c178f96da1fdd48dedd98ac2d2ad6a59da388f091f91bb5722871cca91da diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template index 2edd8f5bda0..05982e0642d 100644 --- a/srcpkgs/nim/template +++ b/srcpkgs/nim/template @@ -1,7 +1,7 @@ # Template file for 'nim' pkgname=nim version=2.0.10 -revision=1 +revision=2 _c2version=86742fb02c6606ab01a532a0085784effb2e753e _nimbleversion=4fb6f8e6c33963f6f510fe82d09ad2a61b5e4265 _checksumsversion=f8f6bd34bfa3fe12c64b919059ad856a96efcba0 @@ -96,6 +96,7 @@ do_install() { ln -sf /usr/lib/nim/bin/$_f ${DESTDIR}/usr/bin/$_f done cp -r nimsuggest nimpretty doc ${DESTDIR}/usr/lib/nim + cp -r dist ${DESTDIR}/usr/lib/nim/ ln -sf /usr/lib/nim/doc ${DESTDIR}/usr/share/nim/doc ln -sf /usr/lib/nim/nimsuggest ${DESTDIR}/usr/share/nim/nimsuggest ln -sf /usr/lib/nim/nimpretty ${DESTDIR}/usr/share/nim/nimpretty diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index aa2d61286f7..f43a9ea7d2e 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=2.11.0 -revision=10 +revision=11 build_style=gnu-configure build_helper=qemu # Use /nix/var as suggested by the official Manual. diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template index f1ccd2bac02..33bb1eb2718 100644 --- a/srcpkgs/noto-fonts-ttf/template +++ b/srcpkgs/noto-fonts-ttf/template @@ -1,7 +1,7 @@ # Template file for 'noto-fonts-ttf' pkgname=noto-fonts-ttf reverts="20220810_1 20190926_2 20190926_1 20181202_1 20181106_1" -version=24.9.1 +version=2024.11.01 revision=1 depends="font-util" short_desc="Google Noto TTF Fonts" @@ -9,7 +9,7 @@ maintainer="classabbyamp " license="OFL-1.1" homepage="https://notofonts.github.io/" distfiles="https://github.com/notofonts/notofonts.github.io/archive/refs/tags/noto-monthly-release-${version}.tar.gz" -checksum=73fc256356e4ed66c54aa300a71c390695603547e127f27cd6eefdeb942726b0 +checksum=f2cfbc9c3b7794819fc12f0b95b6637727e875934f6ee6110b1f4c12ce7114eb font_dirs="/usr/share/fonts/noto" nostrip=yes # just font files diff --git a/srcpkgs/npth/template b/srcpkgs/npth/template index a1cc9e1d1bd..67cf3b2f085 100644 --- a/srcpkgs/npth/template +++ b/srcpkgs/npth/template @@ -1,7 +1,7 @@ # Template file for 'npth' pkgname=npth -version=1.7 -revision=2 +version=1.8 +revision=1 build_style=gnu-configure configure_args="--enable-install-npth-config" short_desc="New portable threads library" @@ -9,12 +9,7 @@ maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" homepage="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git" distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05 - -post_configure() { - # don't depend on silly glibc internals - vsed -i -e 's/defined(__USE_UNIX98) || defined(__USE_XOPEN2K)/1/' src/npth.h -} +checksum=8bd24b4f23a3065d6e5b26e98aba9ce783ea4fd781069c1b35d149694e90ca3e npth-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template index 99be92392ca..0aeb86d1556 100644 --- a/srcpkgs/nqp/template +++ b/srcpkgs/nqp/template @@ -1,6 +1,6 @@ # Template file for 'nqp' pkgname=nqp -version=2024.07 +version=2024.10 revision=1 build_style=configure make_check_target=test @@ -14,7 +14,7 @@ maintainer="Andy Weidenbaum " license="Artistic-2.0" homepage="https://github.com/Raku/nqp" distfiles="https://rakudo.org/dl/nqp/nqp-${version}.tar.gz" -checksum=ab13f2de962817bfedc971088aa6b54911c424150dc284623444ef64878af07e +checksum=1fd1ea24af91fa64f72880af8351de5970c3499dc89699a435572eee0cf5f482 case "$XBPS_TARGET_MACHINE" in arm*|aarch64*) disable_parallel_build=yes;; esac diff --git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch index 8f855527c28..a1b57ad41bb 100644 --- a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch +++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch @@ -1,5 +1,5 @@ ---- a/ntdsextract2-1.4.4/Cargo.toml -+++ b/ntdsextract2-1.4.4/Cargo.toml +--- a/ntdsextract2-1.4.7/Cargo.toml ++++ b/ntdsextract2-1.4.7/Cargo.toml @@ -37,8 +37,7 @@ paste = "1.0" bodyfile = "0.1.4" diff --git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template index 712b091f24f..0db0432addf 100644 --- a/srcpkgs/ntdsextract2/template +++ b/srcpkgs/ntdsextract2/template @@ -1,6 +1,6 @@ # Template file for 'ntdsextract2' pkgname=ntdsextract2 -version=1.4.4 +version=1.4.7 revision=1 _esedbver=0.2.5 build_wrksrc="${pkgname}-${version}" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/janstarke/ntdsextract2" distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz" -checksum="ee449a74b6c671dde43d0d4b75fbe6846b4a2ed26fb70bde337957ad82176241 +checksum="7942eb345a0377c120600064538521dd0bc41adf15e6d7905541ee7f5ccfc546 30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658" make_check=no # testing requires a large sample test file that isn't distributed diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index 1b7e12a105f..6475af5f2ee 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -1,6 +1,6 @@ # Template file for 'nushell' pkgname=nushell -version=0.98.0 +version=0.100.0 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="MIT" homepage="https://www.nushell.sh/" changelog="https://www.nushell.sh/blog/" distfiles="https://github.com/nushell/nushell/archive/refs/tags/${version}.tar.gz" -checksum=c77fd63c4a5f2d35f7dcbb3e9bd76dfaa23acc6bc21fb1de4e7a4a94dc458839 +checksum=00b94984d3140e286e06d4beca2926ef80e0a0cc3ada75916e4fb9fa66ec28ad register_shell="/usr/bin/nu" # all tests fail with argument --target make_check=no diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 6442ff36ce2..5f970340fb6 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers for linux" pkgname=nvidia -version=550.120 -revision=3 +version=550.127.05 +revision=1 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" homepage="https://www.nvidia.com/en-us/drivers/unix/" @@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0" _pkg="NVIDIA-Linux-x86_64-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" -checksum=801928274753ccce7627098ea078cc37070ddae04de3aa084591c05fc7035697 +checksum=d384f34f5d2a896bd7536d3deb6a6d973d8094a3ad485a1c2ee3bf5192086ae9 # subpackages need to be processed in this specific order subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit" depends="nvidia-libs-${version}_${revision} diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template index c09504f3e6b..f731368585a 100644 --- a/srcpkgs/nvme-cli/template +++ b/srcpkgs/nvme-cli/template @@ -1,6 +1,6 @@ # Template file for 'nvme-cli' pkgname=nvme-cli -version=2.8 +version=2.10.2 revision=1 build_style=meson configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d" @@ -9,11 +9,17 @@ makedepends="libnvme-devel zlib-devel json-c-devel" short_desc="NVMe management command line interface" maintainer="Orphaned " license="GPL-2.0-only" -homepage="http://nvmexpress.org" +homepage="https://nvmexpress.org" +changelog="https://github.com/linux-nvme/nvme-cli/releases" distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz" -checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531 +checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904 conf_files="/etc/nvme/*.conf" +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl + ;; +esac + if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libhugetlbfs-devel" else diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch deleted file mode 100644 index 7339c30acbe..00000000000 --- a/srcpkgs/nyxt/patches/001-libfixposix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp -=================================================================== ---- nyxt-2.2.4.orig/_build/iolib/src/syscalls/ffi-functions-unix.lisp -+++ nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp -@@ -11,7 +11,8 @@ - ;; FIXME: move this into an ASDF operation - (eval-when (:compile-toplevel :load-toplevel :execute) - (define-foreign-library -- (libfixposix :canary "lfp_buildinfo") -+ (libfixposix :canary "lfp_buildinfo_not_exist") -+ (:unix "libfixposix.so.3") - (t (:default "libfixposix"))) - (load-foreign-library 'libfixposix)) - diff --git a/srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch b/srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch deleted file mode 100644 index 2354f7b2756..00000000000 --- a/srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch +++ /dev/null @@ -1,45 +0,0 @@ -Source of first patch: https://github.com/andy128k/cl-gobject-introspection/pull/101 -Source of second patch: https://github.com/slburson/fset/pull/46 - -From 4908a84c16349929b309c50409815ff81fb9b3c4 Mon Sep 17 00:00:00 2001 -From: Vasily Postnicov -Date: Sun, 19 May 2024 06:33:44 +0300 -Subject: [PATCH] Fix compilation on not yet released SBCL - ---- - src/init.lisp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/init.lisp b/src/init.lisp -index 8675ee8..194d6aa 100644 ---- a/_build/cl-gobject-introspection/src/init.lisp -+++ b/_build/cl-gobject-introspection/src/init.lisp -@@ -143,4 +143,4 @@ - (destroy-data :pointer) - (connect-flags connect-flags)) - --#+sbcl (sb-ext::set-floating-point-modes :traps nil) -+#+sbcl (sb-int:set-floating-point-modes :traps nil) - -From 67eca709c2a6275692381fbaf018876b2ab11244 Mon Sep 17 00:00:00 2001 -From: Hraban -Date: Fri, 7 Jun 2024 03:58:37 -0400 -Subject: [PATCH] fix: proper external package for sb-int:once-only (#46) - ---- - Code/port.lisp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Code/port.lisp b/Code/port.lisp -index 72f86fe..86673f0 100644 ---- a/_build/fset/Code/port.lisp -+++ b/_build/fset/Code/port.lisp -@@ -363,7 +363,7 @@ - `(if (null ,x) 0 (cl:length ,x)))) - #+sbcl - (defmacro length-nv (x) -- (sb-ext::once-only ((x x)) -+ (sb-int:once-only ((x x)) - `(if (null ,x) 0 (cl:length ,x)))) - #-(or cmu scl sbcl) - (defmacro length-nv (x) diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template index abe5fe63011..b01aa4ce384 100644 --- a/srcpkgs/nyxt/template +++ b/srcpkgs/nyxt/template @@ -1,6 +1,6 @@ # Template file for 'nyxt' pkgname=nyxt -version=3.11.7 +version=3.11.8 revision=1 create_wrksrc=yes build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://nyxt.atlas.engineer/" distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz" -checksum=27d11de1e41ca1c319193678f385a5a3e0bfb805da8f687557a77cba24ab01e1 +checksum=4604b15a4d89336d110926ac91c53eff020ae9c8cd96214d7ed1114bcf6a9254 # Disable check because ASDF/USER::PROVE is not installed make_check=no nostrip=yes diff --git a/srcpkgs/obconf-qt/template b/srcpkgs/obconf-qt/template index 1cb5bc5354b..9e873248714 100644 --- a/srcpkgs/obconf-qt/template +++ b/srcpkgs/obconf-qt/template @@ -1,14 +1,14 @@ # Template file for 'obconf-qt' pkgname=obconf-qt -version=0.16.4 +version=0.16.5 revision=1 build_style=cmake -hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" -makedepends="qt5-x11extras-devel qt5-tools-devel openbox-devel" +hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl pkg-config" +makedepends="qt6-base-devel openbox-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="LXQt Openbox configuration tool" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt.org/" distfiles="https://github.com/lxqt/obconf-qt/releases/download/${version}/obconf-qt-${version}.tar.xz" -checksum=b37d94ff5e3ae527f83e26e970a736775f27749b0946bf6b6cf4c3ac7047a997 +checksum=034883680912f7ea24dbd4c28b8ee4cf096774aa588e39431d319d56a924160c diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template index 2c084fc503c..814dba11dc0 100644 --- a/srcpkgs/octoxbps/template +++ b/srcpkgs/octoxbps/template @@ -1,31 +1,27 @@ # Template file for 'octoxbps' pkgname=octoxbps -version=0.3.3 +version=0.4.0 revision=1 build_style=qmake -hostmakedepends="qt5-qmake pkg-config qt5-host-tools" -makedepends="qt5-declarative-devel qtermwidget-devel" -depends="curl" +build_helper=qmake6 +hostmakedepends="pkg-config qt6-tools qt6-base" +makedepends=" qt6-declarative-devel qtermwidget-qt6-devel qt6-qt5compat-devel" +depends="curl qt-sudo" short_desc="Qt-based XBPS front-end" maintainer="beefcurtains " license="GPL-2.0-or-later" -homepage="https://tintaescura.com/projects/octopi/" +homepage="https://tintaescura.com/projects/octoxbps/" changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG" distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz" -checksum=bf00fca7416b9ecad5e8c6e85d8e3215e8c4ef73c23a2b2c3cbe6773491ff4d5 +checksum=9c01d6a97511e3cecea32d094482e14b40ff3e1ede6576eb45a7e75dd8f39920 post_configure() { + sed -i 's/usr\/local/usr/g' src/constants.h local qmake_args if [ "$CROSS_BUILD" ]; then qmake_args="-qtconf ${wrksrc}/qt.conf" fi - cd ${wrksrc}/notifier && qmake-qt5 ${configure_args} \ - QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \ - QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LFLAGS="${LDFLAGS}" \ - ${qmake_args} - cd ${wrksrc}/sudo && qmake-qt5 ${configure_args} \ + cd ${wrksrc}/notifier && qmake-qt6 ${configure_args} \ QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \ QMAKE_CFLAGS="${CFLAGS}" \ QMAKE_CXXFLAGS="${CXXFLAGS}" \ @@ -34,13 +30,13 @@ post_configure() { } do_build() { - for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do + for _dir in ${wrksrc} ${wrksrc}/notifier; do cd $_dir && make ${makejobs} ${make_build_args} ${make_build_target} CC="$CC" CXX="$CXX" LINK="$CXX" done } do_install() { - for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do + for _dir in ${wrksrc} ${wrksrc}/notifier; do cd $_dir && make INSTALL_ROOT=${DESTDIR} install done } diff --git a/srcpkgs/odilia/patches/fix-lock.diff b/srcpkgs/odilia/patches/fix-lock.diff new file mode 100644 index 00000000000..4312c048733 --- /dev/null +++ b/srcpkgs/odilia/patches/fix-lock.diff @@ -0,0 +1,24 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 9fb0569..ff6fd29 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1005,7 +1005,7 @@ dependencies = [ + + [[package]] + name = "odilia" +-version = "0.1.3" ++version = "0.1.4" + dependencies = [ + "atspi", + "circular-queue", +diff --git a/Cargo.toml b/Cargo.toml +index 9e69a9b..26c3da9 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -1,4 +1,5 @@ + [workspace] ++resolver = "2" + default-members = ["odilia"] + members = [ + "cache", + diff --git a/srcpkgs/odilia/template b/srcpkgs/odilia/template new file mode 100644 index 00000000000..1950e110044 --- /dev/null +++ b/srcpkgs/odilia/template @@ -0,0 +1,16 @@ +# Template file for 'odilia' +pkgname=odilia +version=0.1.4 +revision=1 +build_wrksrc="odilia" +build_style=cargo +depends="speech-dispatcher at-spi2-core gsettings-desktop-schemas" +checkdepends="$depends dbus" +short_desc="Fast screenreader for the *nix desktop" +maintainer="Luca Matei Pintilie " +license="GPL-3.0-or-later" +homepage="https://odilia.app/" +changelog="https://github.com/odilia-app/odilia/raw/main/CHANGELOG.md" +distfiles="https://github.com/odilia-app/odilia/archive/refs/tags/v${version}.tar.gz" +checksum=4a35c7c949e8da919403d3e8a095ca44036e222af9d8d9ebcf5b28bb586f298e +make_check_pre="dbus-run-session --" diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template index 18966a9acb2..03a0a8a96c4 100644 --- a/srcpkgs/oh/template +++ b/srcpkgs/oh/template @@ -1,7 +1,7 @@ # Template file for 'oh' pkgname=oh -version=0.8.0 -revision=4 +version=0.8.3 +revision=1 build_style=go go_import_path="github.com/michaelmacinnis/oh" short_desc="Surprisingly powerful Unix shell" @@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum " license="MIT" homepage="https://github.com/michaelmacinnis/oh" distfiles="https://github.com/michaelmacinnis/oh/archive/v${version}.tar.gz" -checksum=4b5ae57faf6e897700c1a010c1d67e8275c2c7a4daa1f9812111dcbf554336e2 +checksum=3ffd50ae66167ef6c7dcd4e1982b8902d34fbfb88d49bda5f6893bf0bcd92da8 post_install() { vlicense LICENSE diff --git a/srcpkgs/ol/patches/http.patch b/srcpkgs/ol/patches/http.patch deleted file mode 100644 index 672ae727334..00000000000 --- a/srcpkgs/ol/patches/http.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libraries/http/server b/libraries/http/server -index 47127b8f..a51bd17f 100644 ---- a/libraries/http/server -+++ b/libraries/http/server -@@ -148,7 +148,7 @@ - (display " ") - ; list folder: - (define Out (pipe)) -- (define Pid (system (list "/bin/sh" "-c" (string-append -+ (define Pid (execvp (list "/bin/sh" "-c" (string-append - "ls -lah " filename)) #f Out)) - - (send "HTTP/1.0 200 OK\n" diff --git a/srcpkgs/ol/patches/ppcxx.patch b/srcpkgs/ol/patches/ppcxx.patch deleted file mode 100644 index 5d0e1f66e4a..00000000000 --- a/srcpkgs/ol/patches/ppcxx.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/extensions/ffi.c b/extensions/ffi.c -index c6a16d79..02e5c268 100644 ---- a/extensions/ffi.c -+++ b/extensions/ffi.c -@@ -2670,9 +2670,9 @@ word* OLVM_ffi(olvm_t* this, word arguments) - j = l; - } - else { // в регистр с плавающей запятой -+#if (__x86_64__ && (__unix__ || __APPLE__)) - // move from ptr to the ad - *(int64_t*)&ad[d++] = args[j]; --#if (__x86_64__ && (__unix__ || __APPLE__)) - fpmask |= 1; - #endif - } diff --git a/srcpkgs/ol/patches/xxd.patch b/srcpkgs/ol/patches/xxd.patch deleted file mode 100644 index 518caea411f..00000000000 --- a/srcpkgs/ol/patches/xxd.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/GNUmakefile b/GNUmakefile -index 218cc40b..1306f92c 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -49,19 +49,7 @@ includes/ol/vm.h: src/olvm.c - - tmp/repl.c: repl - # vim --ifneq ($(shell which xxd),) - xxd --include repl >tmp/repl.c --else --# coreutils --ifneq ($(shell which od),) -- od -An -vtx1 repl| tr -d '\n'| sed \ -- -e 's/^ /0x/' -e 's/ /,0x/g' \ -- -e 's/^/unsigned char repl[] = {/' \ -- -e 's/$$/};/'> $@ --else -- $(error "You must have 'od' (coreutils) or 'xxd' (vim) tool installed.") --endif --endif - - # or - # echo '(display "unsigned char repl[] = {") (lfor-each (lambda (x) (for-each display (list x ","))) (file->bytestream "repl")) (display "0};")'| ./vm repl> tmp/repl.c diff --git a/srcpkgs/ol/template b/srcpkgs/ol/template index 8b966dcbd29..2848c92cd3a 100644 --- a/srcpkgs/ol/template +++ b/srcpkgs/ol/template @@ -1,10 +1,10 @@ # Template file for 'ol' pkgname=ol -version=2.5.1 +version=2.6 revision=1 build_style=gnu-makefile make_use_env=yes -make_build_args="HAS_SOCKETS=1 HAS_DLOPEN=1 OLVM_FFI=1" +make_build_args="HAVE_SOCKETS=1 HAVE_DLOPEN=1 OLVM_FFI=1" hostmakedepends="xxd" short_desc="Purely functional dialect of Lisp" maintainer="rc-05 " @@ -12,10 +12,10 @@ license="LGPL-3.0-or-later, MIT" homepage="https://yuriy-chumak.github.io/ol/" changelog="https://raw.githubusercontent.com/yuriy-chumak/ol/master/doc/CHANGELOG.md" distfiles=" - https://github.com/yuriy-chumak/ol/archive/${version}.tar.gz + https://github.com/yuriy-chumak/ol/archive/refs/tags/${version}.tar.gz https://github.com/yuriy-chumak/libol-opengl/archive/refs/tags/${version}.tar.gz>libopengl-${version}.tar.gz" -checksum="d9fe66bd15cf9c9c30bf45b97e5825c2101b518fc27c671c08a95798eec3c510 - 5ccb4e056319e16e3825a7c05d8aa456ce0e87a3111597a2177cc63a67978ffb" +checksum="c5506de4005a63039dc96962322ae94bf6c33eeaf63dcc03b07b1e8cc3a4d8f3 + 386bceb757896bcbe4252b0a1a6e2e7d6dc643129210abf35b203e67b2c5d7fb" if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then make_check_args="HAS_64CDEFS=0" @@ -24,11 +24,11 @@ else fi post_extract() { + shopt -s dotglob # collect project files: mv -v ol-${version}/* . - mv -v ol-${version}/.* . rmdir ol-${version} - # move OpenGL submodule to the proper location: + # move the OpenGL submodule to the proper location: mv -v libol-opengl-${version}/* ./libraries/OpenGL/ rmdir libol-opengl-${version} } diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template index 664e556081f..238c6cb29fd 100644 --- a/srcpkgs/open-isns/template +++ b/srcpkgs/open-isns/template @@ -1,21 +1,19 @@ # Template file for 'open-isns' pkgname=open-isns -version=0.102 -revision=2 -build_style=gnu-configure -configure_args="--enable-shared" +version=0.103 +revision=1 +build_style=meson makedepends="openssl-devel" -make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp" conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf" short_desc="Server and client for iSNS" maintainer="Leah Neukirchen " license="LGPL-2.1" homepage="https://github.com/open-iscsi/open-isns" distfiles="https://github.com/open-iscsi/open-isns/archive/v${version}.tar.gz" -checksum=9611344733c0cdf14395f60880950ea4c3c7d6b765565b6493ad3e1afbe216de +checksum=47499f3ce87a832840884dcf3eedbec8c039f472fe921a5378e3b206a3fc1a32 post_extract() { - sed -i 's/ -Werror / /' configure + vsed -i -e 's/builddir/build/g' tests/harness.py } libisns_package() { @@ -29,7 +27,7 @@ libisns-devel_package() { depends="libisns>=${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/pkgconfig vmove usr/lib/*.so - vmove usr/lib/*.a } } diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 64f6e7e8139..17d74927e75 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,6 +1,6 @@ # Template file for 'openjdk17' pkgname=openjdk17 -version=17.0.13+5 +version=17.0.14+1 revision=1 _gtest_ver=1.13.0 _java_ver="${version%%.*}" @@ -43,7 +43,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz https://github.com/google/googletest/archive/refs/tags/v${_gtest_ver}.tar.gz" -checksum="3b87d8c771e8fcebe38435e1019a050a87a20648eda683decaa9fd71bea46861 +checksum="16adebb35c00d54f1660f326f6006dbc2fb098071fd22a3604c89830733f2c52 ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363" alternatives="jdk:/usr/lib/jvm/default-jdk:/${_jdk_home}" provides="java-environment-${version}_1" diff --git a/srcpkgs/openjdk21/template b/srcpkgs/openjdk21/template index f02b024f0f3..661a26ba150 100644 --- a/srcpkgs/openjdk21/template +++ b/srcpkgs/openjdk21/template @@ -1,6 +1,6 @@ # Template file for 'openjdk21' pkgname=openjdk21 -version=21.0.5+5 +version=21.0.6+1 revision=1 _gtest_ver=1.13.0 _java_ver="${version%%.*}" @@ -43,7 +43,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz https://github.com/google/googletest/archive/refs/tags/v${_gtest_ver}.tar.gz" -checksum="5dfed3786d86629bf6aa32046850f29d423398fbec88d5a87ce5c2fb190d7ef5 +checksum="8b710ba4544f2b4fa0448ab2e913e96faafed15b0ab0b87f87de598341d3c41a ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363" alternatives="jdk:/usr/lib/jvm/default-jdk:/${_jdk_home}" provides="java-environment-${version}_1" diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 54438b435ac..253548b04ab 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -1,6 +1,6 @@ # Template file for 'openmpi' pkgname=openmpi -version=5.0.4 +version=5.0.6 revision=1 # OpenMPI >= 5 is 64-bit only archs="x86_64* aarch64* ppc64* riscv64*" @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://www.open-mpi.org/" distfiles="https://download.open-mpi.org/release/open-mpi/v${version%.*}/openmpi-${version}.tar.bz2" -checksum=64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d +checksum=bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157 lib32disabled=yes if [ "${CROSS_BUILD}" ]; then diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 15b01a5ea94..b824330e319 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,6 +1,6 @@ # Template file for 'opensmtpd' pkgname=opensmtpd -version=7.5.0p0 +version=7.6.0p1 revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin @@ -22,7 +22,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause, ISC, MIT" homepage="https://www.opensmtpd.org" distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz" -checksum=84f5c1393c0c1becc72ceea971e0abd7075b2ca7e4e1f8909b83edfd8de0c39c +checksum=b27c806982a6653a2637f810ae7a45372b9a7ff99350ee1003746503ff0e4a97 provides="smtp-forwarder-0_1 smtp-server-0_1" replaces="smtp-forwarder>=0 smtp-server>=0" system_accounts="_smtpd _smtpq" diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 462afb47440..d33b46aa6d0 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=112.0.5197.53 +version=114.0.5282.21 revision=1 archs="x86_64" create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="mobinmob " license="custom:Proprietary" homepage="https://www.opera.com/computer" distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm" -checksum=d79ac7bafd46625c3fb0cc3ef7552aa66373912d528322a74be4c1a8ecff67ab +checksum=a8754623963829f961bbcca33efb3c55edb0dba5f7ca42c585533a26b0bdadec repository="nonfree" nostrip=yes diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template index 03085f03c7f..f1180de4790 100644 --- a/srcpkgs/orc/template +++ b/srcpkgs/orc/template @@ -1,6 +1,6 @@ # Template file for 'orc' pkgname=orc -version=0.4.39 +version=0.4.40 revision=1 build_style=meson build_helper="gir" @@ -13,7 +13,7 @@ license="BSD-2-Clause" homepage="https://cgit.freedesktop.org/gstreamer/orc" changelog="https://gitlab.freedesktop.org/gstreamer/orc/-/raw/main/RELEASE" distfiles="http://gstreamer.freedesktop.org/src/orc/orc-${version}.tar.xz" -checksum=33ed2387f49b825fa1b9c3b0072e05f259141b895474ad085ae51143d3040cc0 +checksum=3fc2bee78dfb7c41fd9605061fc69138db7df007eae2f669a1f56e8bacef74ab build_options="gtk_doc" diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 719049fb1a0..093ab61c4fe 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,6 +1,6 @@ # Template file for 'os-prober' pkgname=os-prober -version=1.81 +version=1.83 revision=1 build_style=gnu-makefile make_dirs="/var/lib/os-prober 0755 root root" @@ -8,8 +8,9 @@ short_desc="Utility to detect other OSes on a set of drives" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://packages.debian.org/sid/os-prober" +changelog="https://metadata.ftp-master.debian.org/changelogs/main/o/os-prober/unstable_changelog" distfiles="${DEBIAN_SITE}/main/o/${pkgname}/${pkgname}_${version}.tar.xz" -checksum=2fd928ec86538227711e2adf49cfd6a1ef74f6bb3555c5dad4e0425ccd978883 +checksum=8c82d5084c2b6f8935f6633612f18d16d04a0deffd6b99c264985fb7204140a6 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) _ARCH="x86";; diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template index 22558554b81..26003383f0e 100644 --- a/srcpkgs/padthv1/template +++ b/srcpkgs/padthv1/template @@ -1,6 +1,6 @@ # Template file for 'padthv1' pkgname=padthv1 -version=1.1.2 +version=1.1.3 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-base" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://padthv1.sourceforge.io/" changelog="https://github.com/rncbc/padthv1/raw/main/ChangeLog" distfiles="${SOURCEFORGE_SITE}/padthv1/padthv1-${version}.tar.gz" -checksum=17fdbadc2114d3f460214d7b1c1a11e7e7c5d638f3ef522674f96a2dd2eb3a06 +checksum=da40332357bec28d7478bcd4b72a9cd7cde9b089b9835786dea10327c2542e8f diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template index cb8e6f275be..02ac2604ead 100644 --- a/srcpkgs/pan/template +++ b/srcpkgs/pan/template @@ -1,19 +1,19 @@ # Template file for 'pan' pkgname=pan -version=0.160 +version=0.161 revision=1 build_style=cmake build_helper=qemu configure_args="-DWANT_GMIME_CRYPTO=ON -DWANT_GKR=ON -DWANT_GNUTLS=ON - -DWANT_GTKSPELL=ON -DWANT_NOTIFY=ON -DENABLE_MANUAL=ON" + -DWANT_GSPELL=ON -DWANT_NOTIFY=ON -DENABLE_MANUAL=ON" hostmakedepends="pkg-config gettext itstool" -makedepends="gtk+3-devel gmime3-devel gtkspell3-devel libnotify-devel +makedepends="gtk+3-devel gmime3-devel gspell-devel libnotify-devel libsecret-devel gcr-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Usenet newsreader that's good at both text and binaries" maintainer="mobinmob " -license="GFDL-1.1-or-later, GPL-2.0-only" +license="GFDL-1.1-or-later AND GPL-2.0-only" homepage="http://pan.rebelbase.com" changelog="https://gitlab.gnome.org/GNOME/pan/-/raw/master/NEWS" distfiles="https://gitlab.gnome.org/GNOME/pan/-/archive/v${version}/pan-v${version}.tar.bz2" -checksum=6506955fc3c94a7e395f82763f45a63dcb564028419ea32249090997c08962a9 +checksum=4c2c34b9e4a13275b73fae4f5dbdb3f857cf6b58c4813a373dd9d67ce37779d9 diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 2b7c7cdc223..956bfa4dac4 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20240922 +version=20241022 revision=1 build_style=gnu-configure hostmakedepends="perl" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/parallel/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=63210715e8b7c5e129e098f333cd7cdd5fc7a2f325e8e0fb9ed6edba9f1acbc4 +checksum=6de22bf1c67f7f316670d21ed1a2a32f1214dfbd3e420939ba937925c0a57a12 pre_configure() { # no html and pdf doc diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template index 962cbfec285..9d07cf6068b 100644 --- a/srcpkgs/pavucontrol-qt/template +++ b/srcpkgs/pavucontrol-qt/template @@ -1,6 +1,6 @@ # Template file for 'pavucontrol-qt' pkgname=pavucontrol-qt -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt6-base qt6-tools perl" @@ -10,4 +10,4 @@ maintainer="Enrico Belleri " license="GPL-2.0-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/pavucontrol-qt/archive/${version}.tar.gz" -checksum=dab3f4a038d34e6319021c55c0f4739512e27b3cde1738a95bdc195633505df6 +checksum=9b654f743d603679bd9a26d0a2cd08f51207266d3e43cf8a038ba0c7aa4ed33d diff --git a/srcpkgs/pax-utils/template b/srcpkgs/pax-utils/template index 843bd58ed9f..d3106267722 100644 --- a/srcpkgs/pax-utils/template +++ b/srcpkgs/pax-utils/template @@ -13,3 +13,12 @@ homepage="https://cgit.gentoo.org/proj/pax-utils.git/" distfiles="https://cgit.gentoo.org/proj/pax-utils.git/snapshot/pax-utils-${version}.tar.gz" checksum=60a3ae882b0722806aa4f8f0f6256271553259eee0d3875f16c0e3b604503847 python_version=3 + +pre_check() { + vsed -i tests/source/dotest -e '/lib\.sh/s,$,;top_srcdir="../../",' + + # ignore wrong symlinks + # -/usr/lib64/libc.so + # +/lib/libc.so + vsed -i tests/lddtree/dotest-cmp -e '/fail "lddtree/s/$/ ; ret=0/' +} diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template index 190858d6206..0082f6bd32b 100644 --- a/srcpkgs/pcmanfm-qt/template +++ b/srcpkgs/pcmanfm-qt/template @@ -1,6 +1,6 @@ # Template file for 'pcmanfm-qt' pkgname=pcmanfm-qt -version=2.0.0 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools libfm-qt-devel perl" @@ -11,5 +11,5 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/pcmanfm-qt/archive/${version}.tar.gz" -checksum=adb7a7164511452dd6ecfeae9fd6a70b61c66e4d0e7c605e37e9d3e1d6487f2d +checksum=c117e92c24d770ebe0184703e0a4bc61e3281fcfc9a3b3b4eb7614f9b855f023 replaces="lxqt-common>=0" diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template index d36b7b5c44a..a29639e05fd 100644 --- a/srcpkgs/pd/template +++ b/srcpkgs/pd/template @@ -1,6 +1,6 @@ # Template file for 'pd' pkgname=pd -version=0.55.1 +version=0.55.2 revision=1 _ver=${version%.*}-${version##*.} build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="BSD-3-Clause" homepage="https://puredata.info" distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz" -checksum=e8d37345ee4a02092bf2e1f905d86c3209a797a960b309e6200ec473d4fbabd9 +checksum=108297f8d1dd190df8e8bb4a4ac348792accf704f9a2052d93cba8c9b8bb5a5b pre_configure() { ./autogen.sh diff --git a/srcpkgs/pdfcpu/template b/srcpkgs/pdfcpu/template index 98ade07794b..8a17760393e 100644 --- a/srcpkgs/pdfcpu/template +++ b/srcpkgs/pdfcpu/template @@ -1,6 +1,6 @@ # Template file for 'pdfcpu' pkgname=pdfcpu -version=0.8.1 +version=0.9.1 revision=1 build_style=go go_import_path="github.com/pdfcpu/pdfcpu" @@ -11,4 +11,4 @@ license="Apache-2.0" homepage="http://pdfcpu.io/" changelog="https://github.com/pdfcpu/pdfcpu/releases" distfiles="https://github.com/pdfcpu/pdfcpu/archive/v${version}.tar.gz" -checksum=965624c0d714d8ae2c3db06874ae37973d37bb7815ea4eeec7c761ffc6143a1a +checksum=79572e599deddfaa72109f3e029b74b8cd6070657355e8cc9d8c7fb91da73c71 diff --git a/srcpkgs/perl-Business-ISBN-Data/template b/srcpkgs/perl-Business-ISBN-Data/template index 4ce2414bad6..f41212f4f92 100644 --- a/srcpkgs/perl-Business-ISBN-Data/template +++ b/srcpkgs/perl-Business-ISBN-Data/template @@ -1,6 +1,6 @@ # Template file for 'perl-Business-ISBN-Data' pkgname=perl-Business-ISBN-Data -version=20210112.006 +version=20241105.001 revision=1 build_style=perl-module hostmakedepends="perl" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Business-ISBN-Data/" distfiles="${CPAN_SITE}/Business/${pkgname/perl-/}-${version}.tar.gz" -checksum=98c2cfb266b5fdd016989abaa471d9dd4c1d593c508a6f01f66d184d5fee8bae +checksum=089a180934e0846b7a84528bbb125916a085d6bb16037f3b6c445d897f268904 diff --git a/srcpkgs/perl-Business-ISBN/template b/srcpkgs/perl-Business-ISBN/template index 8028d0fecc0..8268bc2f604 100644 --- a/srcpkgs/perl-Business-ISBN/template +++ b/srcpkgs/perl-Business-ISBN/template @@ -1,6 +1,6 @@ # Template file for 'perl-Business-ISBN' pkgname=perl-Business-ISBN -version=3.006 +version=3.009 revision=1 build_style=perl-module hostmakedepends="perl" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Business-ISBN/" distfiles="${CPAN_SITE}/Business/${pkgname/perl-/}-${version}.tar.gz" -checksum=c1fefe68354ffb80cdbd24303ebe684b3b6828df3d5f09b429a09fc4f0919c9a +checksum=d2ec1970454af1b2c099dd34caa7a348ca6fd323bb7ddbfad55389bd7f96789b diff --git a/srcpkgs/perl-CPAN-Meta-Check/template b/srcpkgs/perl-CPAN-Meta-Check/template index 7eca06e4ebe..93a4ade88f1 100644 --- a/srcpkgs/perl-CPAN-Meta-Check/template +++ b/srcpkgs/perl-CPAN-Meta-Check/template @@ -1,7 +1,7 @@ # Template file for 'perl-CPAN-Meta-Check' pkgname=perl-CPAN-Meta-Check -version=0.014 -revision=3 +version=0.018 +revision=1 build_style=perl-module hostmakedepends="perl" makedepends="perl" @@ -12,4 +12,4 @@ maintainer="Orphaned " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/CPAN-Meta-Check" distfiles="${CPAN_SITE}/CPAN/${pkgname/perl-/}-${version}.tar.gz" -checksum=28a0572bfc1c0678d9ce7da48cf521097ada230f96eb3d063fcbae1cfe6a351f +checksum=f619d2df5ea0fd91c8cf83eb54acccb5e43d9e6ec1a3f727b3d0ac15d0cf378a diff --git a/srcpkgs/perl-Crypt-DES_EDE3/template b/srcpkgs/perl-Crypt-DES_EDE3/template index 3beea777930..2606acfaf92 100644 --- a/srcpkgs/perl-Crypt-DES_EDE3/template +++ b/srcpkgs/perl-Crypt-DES_EDE3/template @@ -1,14 +1,14 @@ # Template file for 'perl-Crypt-DES_EDE3' pkgname=perl-Crypt-DES_EDE3 -version=0.01 -revision=2 +version=0.03 +revision=1 build_style=perl-module hostmakedepends="perl" makedepends="perl perl-Crypt-DES" -depends="perl" +depends="perl perl-Crypt-DES" short_desc="Perl interface to Triple-DES EDE block cipher" maintainer="newbluemoon " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Crypt-DES_EDE3" distfiles="${CPAN_SITE}/Crypt/Crypt-DES_EDE3-${version}.tar.gz" -checksum=9cb2e04b625e9cc0833cd499f76fd12556583ececa782a9758a55e3f969748d6 +checksum=28592db7b9e34745aa91f3e19e5dbbb83aaf472a29e707b9791d0d02b3e227f5 diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template index 1d5be567992..e77d4d10810 100644 --- a/srcpkgs/perl-CryptX/template +++ b/srcpkgs/perl-CryptX/template @@ -1,6 +1,6 @@ # Template file for 'perl-CryptX' pkgname=perl-CryptX -version=0.082 +version=0.084 revision=1 build_style=perl-module hostmakedepends="perl" @@ -13,4 +13,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later, Unlicense" homepage="https://metacpan.org/release/CryptX" changelog="https://raw.githubusercontent.com/DCIT/perl-CryptX/master/Changes" distfiles="${CPAN_SITE}/Crypt/${pkgname#perl-}-${version}.tar.gz" -checksum=a31a97b773671850d450ffd30951e60680ae1319a0221b5de5fde9a06c949bbf +checksum=3b392d2dfdac93c1597f5406ac5cb51307b611b825b95206b1a5914205f9aadb diff --git a/srcpkgs/perl-IPC-Run/template b/srcpkgs/perl-IPC-Run/template index 20242cccc98..a13067dc38c 100644 --- a/srcpkgs/perl-IPC-Run/template +++ b/srcpkgs/perl-IPC-Run/template @@ -1,7 +1,7 @@ # Template file for 'perl-IPC-Run' pkgname=perl-IPC-Run -version=20200505.0 -revision=2 +version=20231003.0 +revision=1 build_style=perl-module hostmakedepends="perl" makedepends="${hostmakedepends}" @@ -11,4 +11,4 @@ maintainer="Zach Dykstra " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/IPC-Run" distfiles="${CPAN_SITE}/IPC/IPC-Run-${version}.tar.gz" -checksum=816ebf217fa0df99c583d73c0acc6ced78ac773787c664c75cbf140bb7e4c901 +checksum=eb25bbdf5913d291797ef1bfe998f15130b455d3ed02aacde6856f0b25e4fe57 diff --git a/srcpkgs/perl-Test-Warnings/template b/srcpkgs/perl-Test-Warnings/template index b472113aba9..373927aecc0 100644 --- a/srcpkgs/perl-Test-Warnings/template +++ b/srcpkgs/perl-Test-Warnings/template @@ -1,6 +1,6 @@ # Template file for 'perl-Test-Warnings' pkgname=perl-Test-Warnings -version=0.032 +version=0.033 revision=1 build_style=perl-module hostmakedepends="perl" @@ -12,4 +12,4 @@ maintainer="Zach Dykstra " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Test-Warnings" distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" -checksum=4727dae2416e9f07e41e2dc3a9143ba6affc1ec57652117c99d50038e313e9d9 +checksum=b9c375719f2c61c5f97aa5ee6cf4c901a972347c415969379b0b51f67c48bbcb diff --git a/srcpkgs/perl-namespace-autoclean/template b/srcpkgs/perl-namespace-autoclean/template index 0d9a149aa53..9cc1404a331 100644 --- a/srcpkgs/perl-namespace-autoclean/template +++ b/srcpkgs/perl-namespace-autoclean/template @@ -1,15 +1,15 @@ # Template file for 'perl-namespace-autoclean' pkgname=perl-namespace-autoclean -version=0.29 -revision=2 +version=0.31 +revision=1 build_style=perl-module hostmakedepends="perl" -makedepends="${hostmakedepends} perl-Sub-Identify perl-namespace-clean perl-B-Hooks-EndOfScope" +makedepends="perl perl-namespace-clean perl-B-Hooks-EndOfScope" depends="${makedepends}" -checkdepends="perl-Test-Needs" +checkdepends="perl-Moo perl-Sub-Name perl-Test-Needs" short_desc="Keep imports out of your namespace" maintainer="newbluemoon " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/namespace-autoclean" distfiles="${CPAN_SITE}/namespace/${pkgname/perl-/}-$version.tar.gz" -checksum=45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804 +checksum=d3b32c82e1d2caa9d58b8c8075965240e6cab66ab9350bd6f6bea4ca07e938d6 diff --git a/srcpkgs/perl-rename/template b/srcpkgs/perl-rename/template index 5e61275ac6b..734e664fa86 100644 --- a/srcpkgs/perl-rename/template +++ b/srcpkgs/perl-rename/template @@ -1,6 +1,6 @@ # Template file for 'perl-rename' pkgname=perl-rename -version=1.11 +version=1.14 revision=1 build_style=perl-module hostmakedepends="perl" @@ -9,9 +9,9 @@ depends="perl" short_desc="Renames multiple files using Perl regular expressions" maintainer="Georg Schabel " license="Artistic-1.0-Perl, GPL-1.0-or-later" -homepage="https://metacpan.org/release/PEDERST/rename-1.11" +homepage="https://metacpan.org/release/PEDERST/rename-${version}" distfiles="${CPAN_SITE}/Palm/PEDERST/rename-${version}.tar.gz" -checksum=2f03f33d3a17d3a3599c83f514f0694fd833b606920132925e3fdbd8a1a3e44b +checksum=4d19e5cb8fb09fe35e6df69ae07132cf621b0b2a82f54149091bce630642adbd do_install() { vman blib/man1/rename.1p perl-rename.1p diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template index b82c5b4cd29..5820e8563a9 100644 --- a/srcpkgs/peru/template +++ b/srcpkgs/peru/template @@ -1,7 +1,7 @@ # Template file for 'peru' pkgname=peru -version=1.3.1 -revision=2 +version=1.3.2 +revision=1 build_style=python3-pep517 hostmakedepends="hatchling python3-wheel" depends="curl git mercurial python3 python3-docopt python3-yaml" @@ -11,7 +11,7 @@ maintainer="Andy Weidenbaum " license="MIT" homepage="https://github.com/buildinspace/peru" distfiles="https://github.com/buildinspace/peru/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=6a21108f8b0417301d3cd76fa220906cea9d58f95208b70191282972f8bb8ff9 +checksum=5778f76e83aedc1b01cd77992716a855c134346168a9167c37b8c1ac9c22dfa3 do_check() { local skiptests diff --git a/srcpkgs/picom/template b/srcpkgs/picom/template index 58e70dce623..afd2b19cab7 100644 --- a/srcpkgs/picom/template +++ b/srcpkgs/picom/template @@ -1,20 +1,18 @@ # Template file for 'picom' pkgname=picom -version=11.2 +version=12.4 revision=1 build_style=meson configure_args="-Dwith_docs=true" -hostmakedepends="pkg-config asciidoc" -makedepends="MesaLib-devel dbus-devel libconfig-devel libepoxy-devel libev-devel - pcre2-devel pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel uthash" -depends="desktop-file-utils" +hostmakedepends="pkg-config ruby-asciidoctor" +makedepends="dbus-devel libconfig-devel libepoxy-devel libev-devel pcre2-devel + pixman-devel uthash xcb-util-image-devel xcb-util-renderutil-devel" short_desc="Lightweight compositor for X11 (previously a compton fork)" maintainer="0x5c " -license="MIT, MPL-2.0" +license="MPL-2.0 AND MIT" homepage="https://github.com/yshui/picom/" distfiles="https://github.com/yshui/picom/archive/v${version}.tar.gz" -checksum=1c1063936faf09ed9bba726e7737a562564b7a5f8cdef79d48fcdaf3669a4df4 +checksum=ee8554d4b3fe8e08673352d861ed8ed9c8b62220d56baa77b4080f4d178856a0 post_install() { vlicense LICENSES/MIT diff --git a/srcpkgs/pidgin-gpg/template b/srcpkgs/pidgin-gpg/template index f23c33e0fb4..0cd00bc4c04 100644 --- a/srcpkgs/pidgin-gpg/template +++ b/srcpkgs/pidgin-gpg/template @@ -9,5 +9,5 @@ short_desc="GnuPG plug-in for the Pidgin IM" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://github.com/segler-alex/Pidgin-GPG" -distfiles="http://github.com/downloads/segler-alex/Pidgin-GPG/${pkgname}-${version}.tar.gz" +distfiles="https://sources.voidlinux.org/pidgin-gpg-${version}/pidgin-gpg-${version}.tar.gz" checksum=736681cb25da31eb8ced96055d4150d649fe6ef6e523b6f65846c3446ac09a96 diff --git a/srcpkgs/pidgin-window-merge/template b/srcpkgs/pidgin-window-merge/template index d6b3cedb9a7..15006deb2cc 100644 --- a/srcpkgs/pidgin-window-merge/template +++ b/srcpkgs/pidgin-window-merge/template @@ -9,5 +9,5 @@ short_desc="Pidgin plugin that merges the Buddy List and the conversation window maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/dm0-/window_merge" -distfiles="https://github.com/downloads/dm0-/window_merge/window_merge-${version}.tar.gz" +distfiles="https://sources.voidlinux.org/pidgin-window-merge-${version}/window_merge-${version}.tar.gz" checksum=e890c829f8f074ca0bbf32a0bd3c9b8008802f2795d6f40a19756379e2ce6531 diff --git a/srcpkgs/pinfo/patches/36.patch b/srcpkgs/pinfo/patches/36.patch new file mode 100644 index 00000000000..946aff15be3 --- /dev/null +++ b/srcpkgs/pinfo/patches/36.patch @@ -0,0 +1,57 @@ +From 032dbfc4bf9ff45719de64d251244ab1307db17c Mon Sep 17 00:00:00 2001 +From: "David H. Bronke" +Date: Sun, 9 Jun 2024 12:12:05 +0200 +Subject: [PATCH 1/2] Fall back to running man without -W since some + implementations don't allow that + +Fixes #12. + +Change courtesy of loreb: https://github.com/baszoetekouw/pinfo/issues/12#issuecomment-884322986 +--- + src/manual.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/manual.c b/src/manual.c +index 5f058ff..791df32 100644 +--- a/src/manual.c ++++ b/src/manual.c +@@ -186,8 +186,14 @@ set_initial_history(char *name) + pathFile = popen(buf, "r"); + if (fgets(buf, sizeof(buf), pathFile)==NULL) + { +- fprintf(stderr, "Error executing command '%s'\n", buf); +- exit(1); ++ /* Try without -W */ ++ snprintf(buf, sizeof(buf), "man -w %s %s", ManOptions, name); ++ pathFile = popen(buf, "r"); ++ if (fgets(buf, sizeof(buf), pathFile)==NULL) ++ { ++ fprintf(stderr, "Error executing command '%s'\n", buf); ++ exit(1); ++ } + } + pclose(pathFile); + /* buf will be of the form "/usr/share/man/man1/sleep.1.gz". We + +From c3722aa478420b6671ed932503e06886e04d4287 Mon Sep 17 00:00:00 2001 +From: "David H. Bronke" +Date: Sat, 29 Jun 2024 14:55:46 +0200 +Subject: [PATCH 2/2] fix(src/manual.c): close pathFile before reopening + +Suggested by @xaizek +--- + src/manual.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/manual.c b/src/manual.c +index 791df32..bb730ee 100644 +--- a/src/manual.c ++++ b/src/manual.c +@@ -186,6 +186,7 @@ set_initial_history(char *name) + pathFile = popen(buf, "r"); + if (fgets(buf, sizeof(buf), pathFile)==NULL) + { ++ pclose(pathFile); + /* Try without -W */ + snprintf(buf, sizeof(buf), "man -w %s %s", ManOptions, name); + pathFile = popen(buf, "r"); diff --git a/srcpkgs/pinfo/template b/srcpkgs/pinfo/template index 7f6cd17f900..fa4fb001f8c 100644 --- a/srcpkgs/pinfo/template +++ b/srcpkgs/pinfo/template @@ -1,7 +1,7 @@ # Template file for 'pinfo' pkgname=pinfo version=0.6.13 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake gettext gettext-devel tar texinfo" makedepends="ncurses-devel" diff --git a/srcpkgs/pipectl/template b/srcpkgs/pipectl/template index fe92e161709..1142bf7318a 100644 --- a/srcpkgs/pipectl/template +++ b/srcpkgs/pipectl/template @@ -1,6 +1,6 @@ # Template file for 'pipectl' pkgname=pipectl -version=0.5.0 +version=0.5.1 revision=1 build_style=cmake configure_args="-DINSTALL_DOCUMENTATION=ON" @@ -11,4 +11,4 @@ license="GPL-3.0-or-later" homepage="https://github.com/Ferdi265/pipectl" changelog="https://github.com/Ferdi265/pipectl/releases" distfiles="https://github.com/Ferdi265/pipectl/archive/refs/tags/v${version}.tar.gz" -checksum=dfb620eb02a3c43af88912bdbda2963aa78e1c6ed8f9faa41e7dbdf006f3c7de +checksum=8addbcfac652ddfe88fc47ed10855dc5da3ae3cd3421be9d3ad3a5fb9f9227fd diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index a2fe3250779..233c80ee792 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=1.2.5 +version=1.2.6 revision=1 build_style=meson configure_args=" @@ -41,7 +41,7 @@ license="MIT" homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" -checksum=4c3209c78ce63af6bd2658e5092c220d844fc2b7a039bbbb950e71890cc8ac78 +checksum=8d9b4e95dba33d218c760fecbb71672c86a56917f803e96fe6c3af62fa783a95 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire" diff --git a/srcpkgs/plattenalbum/template b/srcpkgs/plattenalbum/template new file mode 100644 index 00000000000..c76f470657d --- /dev/null +++ b/srcpkgs/plattenalbum/template @@ -0,0 +1,21 @@ +# Template file for 'plattenalbum' +pkgname=plattenalbum +version=2.2.1 +revision=1 +build_style=meson +hostmakedepends="gettext pkg-config glib-devel gtk4-update-icon-cache desktop-file-utils" +makedepends="gtk4-devel libadwaita-devel" +depends="python3-mpd2 python3-gobject gtk4 libadwaita mpd" +short_desc="Simple music browser for MPD" +maintainer="Orphaned " +license="GPL-3.0-or-later" +homepage="https://github.com/SoongNoonien/plattenalbum/" +changelog="https://github.com/SoongNoonien/plattenalbum/releases" +distfiles="https://github.com/SoongNoonien/plattenalbum/archive/refs/tags/v$version.tar.gz" +checksum=38495a0989f3a5b8049e2ec0a17bfb94ea60ab892ec001ac2f12a9e9a6c4f80b + +mpdevil_package() { + build_style=meta + short_desc+=" - transitional dummy package" + depends="${sourcepkg}>=${version}_${revision}" +} diff --git a/srcpkgs/pmars/template b/srcpkgs/pmars/template index 9dd10b53213..ba561d97dc7 100644 --- a/srcpkgs/pmars/template +++ b/srcpkgs/pmars/template @@ -1,14 +1,14 @@ # Template file for 'pmars' pkgname=pmars -version=0.9.2 +version=0.9.4 revision=1 makedepends="libX11-devel" short_desc="Reference implementation of Corewar game" maintainer="Robert Lowry " license="GPL-2.0-or-later" -homepage="https://sourceforge.net/projects/corewar/" -distfiles="${SOURCEFORGE_SITE}/project/corewar/pMARS/${version}/${pkgname}-${version}.tar.gz" -checksum=2ae8638ec6b65350cf9f813a60e338b534dffa78c3e85f1823a2bee8b7c20a34 +homepage="http://www.koth.org/pmars/" +distfiles="http://www.koth.org/pmars/pmars-${version}.zip" +checksum=26c2860ee5906b5e90262ce18d511c8cc395ee6f6796e99631b1910bd0a84c4c do_build() { make -C src CC="${CC}" @@ -17,4 +17,5 @@ do_build() { do_install() { vbin src/pmars vman doc/pmars.6 + vdoc config/pmars.mac } diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template index 3e572e9fa27..760b8af126d 100644 --- a/srcpkgs/pmbootstrap/template +++ b/srcpkgs/pmbootstrap/template @@ -1,15 +1,15 @@ # Template file for 'pmbootstrap' pkgname=pmbootstrap -version=2.3.1 +version=3.0.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel" -depends="git openssl python3" +depends="git openssl python3 kpartx util-linux" +checkdepends="python3-pytest ${depends}" short_desc="Package build and device flashing tool for postmarketOS" maintainer="Jami Kettunen " license="GPL-3.0-or-later" homepage="https://postmarketos.org" -changelog="https://gitlab.com/postmarketOS/pmbootstrap/-/tags" -distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz" -checksum=aba09c0a27918dac4b07641339ccf86e6ec0d14d4602056dac44ec49af12c894 -make_check=no # tests require chroot +changelog="https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags" +distfiles="https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz" +checksum=80bb9b105e9ddae07be8ac7b56299a50541ac4671e592544761fdbbbee5e09f4 diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template index 30f9236e34f..bb7743a3f9b 100644 --- a/srcpkgs/pnpm/template +++ b/srcpkgs/pnpm/template @@ -1,6 +1,6 @@ # Template file for 'pnpm' pkgname=pnpm -version=9.11.0 +version=9.13.2 revision=1 build_style=fetch hostmakedepends="nodejs jq" @@ -10,7 +10,7 @@ maintainer="Bnyro " license="MIT" homepage="https://pnpm.io/" distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz" -checksum=1c0e33f70e5df9eede84a357bdfa0b1f9dba6e58194628d48a1055756f553754 +checksum=ccce81bf7498c5f0f80e31749c1f8f03baba99d168f64590fc7e13fad3ea1938 python_version=3 do_install() { diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 332dac201f4..d1b01f71200 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,6 +1,6 @@ # Template file for 'poedit' pkgname=poedit -version=3.4.4 +version=3.5.1 revision=1 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" @@ -14,7 +14,7 @@ license="MIT" homepage="https://www.poedit.net/" changelog="https://raw.githubusercontent.com/vslavik/poedit/master/NEWS" distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz" -checksum=29cda1611e01af491e0c770a87cd6d24c5ccfe8737dfbc0f2f23847ba0d821ed +checksum=4bd6ce33a1154828584166fc8b3de9859dcca317be120a6a44a296b2c58a34d7 CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy" CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template index f27e036bfa9..745f2def068 100644 --- a/srcpkgs/postgis-postgresql15/template +++ b/srcpkgs/postgis-postgresql15/template @@ -1,6 +1,6 @@ # Template file for 'postgis-postgresql15' pkgname=postgis-postgresql15 -version=3.4.2 +version=3.5.0 revision=1 build_style=gnu-configure configure_args=" @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://postgis.net/" changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS" distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz" -checksum=c8c874c00ba4a984a87030af6bf9544821502060ad473d5c96f1d4d0835c5892 +checksum=ca698a22cc2b2b3467ac4e063b43a28413f3004ddd505bdccdd74c56a647f510 nocross="FIXME: Cannot run test program to determine PROJ version" pre_configure() { diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template index 983205b5832..4348e175374 100644 --- a/srcpkgs/postgis-postgresql16/template +++ b/srcpkgs/postgis-postgresql16/template @@ -1,6 +1,6 @@ # Template file for 'postgis-postgresql16' pkgname=postgis-postgresql16 -version=3.4.2 +version=3.5.0 revision=1 build_style=gnu-configure configure_args=" @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://postgis.net/" changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS" distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz" -checksum=c8c874c00ba4a984a87030af6bf9544821502060ad473d5c96f1d4d0835c5892 +checksum=ca698a22cc2b2b3467ac4e063b43a28413f3004ddd505bdccdd74c56a647f510 nocross="FIXME: Cannot run test program to determine PROJ version" pre_configure() { diff --git a/srcpkgs/postgresql15/template b/srcpkgs/postgresql15/template index 41768394c0f..0c41dc5c49e 100644 --- a/srcpkgs/postgresql15/template +++ b/srcpkgs/postgresql15/template @@ -1,6 +1,6 @@ # Template file for 'postgresql15' pkgname=postgresql15 -version=15.7 +version=15.8 revision=1 build_style=gnu-configure make_build_target=world @@ -21,7 +21,7 @@ license="PostgreSQL" homepage="https://www.postgresql.org" changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html" distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2" -checksum=a46fe49485ab6385e39dabbbb654f5d3049206f76cd695e224268729520998f7 +checksum=4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a make_check=ci-skip # Postgres server can't be run as root conf_files=" diff --git a/srcpkgs/postgresql16/template b/srcpkgs/postgresql16/template index ea321149292..7ff69ed08d2 100644 --- a/srcpkgs/postgresql16/template +++ b/srcpkgs/postgresql16/template @@ -1,6 +1,6 @@ # Template file for 'postgresql16' pkgname=postgresql16 -version=16.3 +version=16.4 revision=1 build_style=gnu-configure make_build_target=world @@ -21,7 +21,7 @@ license="PostgreSQL" homepage="https://www.postgresql.org" changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html" distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2" -checksum=331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585 +checksum=971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f make_check=ci-skip # Postgres server can't be run as root conf_files=" diff --git a/srcpkgs/pqiv/template b/srcpkgs/pqiv/template index 7d638c03105..ac0265cde87 100644 --- a/srcpkgs/pqiv/template +++ b/srcpkgs/pqiv/template @@ -1,7 +1,7 @@ # Template file for 'pqiv' pkgname=pqiv -version=2.13.1 -revision=2 +version=2.13.2 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="glib-devel gtk+3-devel $(vopt_if ffmpeg ffmpeg6-devel) @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://github.com/phillipberndt/pqiv/" distfiles="https://github.com/phillipberndt/${pkgname}/archive/${version}.tar.gz" -checksum=1db8567f75884dfc5dd41208f309b11e4e4ca48ecad537915885b64aa03857a4 +checksum=154cbbe0a62be12cee23b0a46a86b2305d8128fd19924308ad5e9d22fa5ad4f7 build_options="ffmpeg archive webp ps pdf" build_options_default="ffmpeg archive webp" desc_option_archive="Enable support for viewing archives/comic books" diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template index bc1d622ba80..919402637f5 100644 --- a/srcpkgs/pre-commit/template +++ b/srcpkgs/pre-commit/template @@ -1,6 +1,6 @@ # Template file for 'pre-commit' pkgname=pre-commit -version=3.7.1 +version=4.0.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ license="MIT" homepage="https://pre-commit.com/" changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md" distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz" -checksum=8ca3ad567bc78a4972a3f1a477e94a79d4597e8140a6e0b651c5e33899c3654a +checksum=80905ac375958c0444c65e9cebebd948b3cdb518f335a091a670a89d652139d2 make_check=no # unpackaged: pytest-env re-assert post_install() { diff --git a/srcpkgs/primesieve/template b/srcpkgs/primesieve/template index 36ba691bc0f..312d1745a13 100644 --- a/srcpkgs/primesieve/template +++ b/srcpkgs/primesieve/template @@ -1,6 +1,6 @@ # Template file for 'primesieve' pkgname=primesieve -version=12.4 +version=12.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF" @@ -10,7 +10,7 @@ license="BSD-2-Clause" homepage="https://github.com/kimwalisch/primesieve" changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/ChangeLog" distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz" -checksum=eb7081adebe8030e93b3675c74ac603438d10a36792246b274c79f11d8a987ce +checksum=20b06975a909dd58b956445948f7460086d8b49f2bc58880eac56400dcc66d64 post_install() { vlicense COPYING diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template index 0def0a0497b..ce020d07151 100644 --- a/srcpkgs/procs/template +++ b/srcpkgs/procs/template @@ -1,6 +1,6 @@ # Template file for 'procs' pkgname=procs -version=0.14.6 +version=0.14.8 revision=1 build_style=cargo build_helper=qemu @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/dalance/procs" changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md" distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz" -checksum=3d5cd529c858ca637b166bac908e0d8429c33bdfa9d8db6282f36d5732e4e30a +checksum=b9cf37275bdf1c03786a035c1cd495a93cbf94406eb8c261825d1fd59dcfd61d post_install() { PROCS="${DESTDIR}/usr/bin/procs" diff --git a/srcpkgs/pwru/template b/srcpkgs/pwru/template index ac551e5a9be..402294aff1e 100644 --- a/srcpkgs/pwru/template +++ b/srcpkgs/pwru/template @@ -1,6 +1,6 @@ # Template file for 'pwru' pkgname=pwru -version=1.0.8 +version=1.0.9 revision=1 build_style=go go_import_path="github.com/cilium/pwru" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/cilium/pwru" distfiles="https://github.com/cilium/pwru/archive/refs/tags/v${version}.tar.gz" -checksum=e04d9d3d5953025c285e010d73419a1515be9b3f32b72ca9e403219a3c8ab690 +checksum=e02770901a1f10144e2ef5b9b2e3687e6a7f7eb108fa9938f7bf0d11ab69b063 nocross="go generate runs on wrong architecture" pre_build() { diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template index 9ef6ace3327..b9f1cc0f98a 100644 --- a/srcpkgs/pyradio/template +++ b/srcpkgs/pyradio/template @@ -1,6 +1,6 @@ # Template file for 'pyradio' pkgname=pyradio -version=0.9.3.11 +version=0.9.3.11.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel" @@ -12,7 +12,7 @@ license="MIT" homepage="https://www.coderholic.com/pyradio/" changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog" distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz" -checksum=bb58052b01a726ccb6e3272b984f20a530c996f708ba45b39e15650356283c9e +checksum=a5e37a815881a34925ce7c1bffd1205a000670529ed8bb5a3a12dd1bd0011eef make_check=no # pytest reports "no tests ran" post_patch() { diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template index 7b26d07aa49..715ed93ab41 100644 --- a/srcpkgs/pyright/template +++ b/srcpkgs/pyright/template @@ -1,6 +1,6 @@ # Template file for 'pyright' pkgname=pyright -version=1.1.385 +version=1.1.389 revision=1 build_wrksrc="packages/pyright" hostmakedepends="nodejs python3-setuptools pkg-config" @@ -12,7 +12,7 @@ license="MIT" homepage="https://microsoft.github.io/pyright" changelog="https://github.com/microsoft/pyright/releases" distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz" -checksum=0be2cf3b2ebbadde203a2e7e1f3e23017aa58bb43bfd1e45a08afbd1dea49c2e +checksum=d34dd0f0a8b394ac4d8aaa6527ab5f6b1bef71f91613e3f4e160b23bb2075083 case "$XBPS_TARGET_MACHINE" in i686*) broken="lerna doesn't support i686" ;; diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template index 0b5e16d6988..447024b66da 100644 --- a/srcpkgs/pysolfc/template +++ b/srcpkgs/pysolfc/template @@ -1,6 +1,6 @@ # Template file for 'pysolfc' pkgname=pysolfc -version=3.0.0 +version=3.1.0 revision=1 build_style=python3-module hostmakedepends="gettext python3-pygame python3-random2 python3-six @@ -11,8 +11,9 @@ short_desc="Python solitaire game collection" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://pysolfc.sourceforge.io/" +changelog="https://github.com/shlomif/PySolFC/blob/master/NEWS.asciidoc" distfiles="https://github.com/shlomif/PySolFC/archive/pysolfc-${version}.tar.gz" -checksum=f600a48712744f0c9e34227380d79e915154f1b1526d902c0a6b9aa52130e60b +checksum=33d02bb437515f2d962e2828b6dfa671fa6082027b343d91f469dbbe2fced108 post_build() { make mo rules diff --git a/srcpkgs/python3-Faker/template b/srcpkgs/python3-Faker/template index 322711b244b..8ce47bf6c2d 100644 --- a/srcpkgs/python3-Faker/template +++ b/srcpkgs/python3-Faker/template @@ -1,6 +1,6 @@ # Template file for 'python3-Faker' pkgname=python3-Faker -version=30.6.0 +version=33.0.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools" @@ -13,7 +13,7 @@ license="MIT" homepage="https://faker.readthedocs.io/en/master/" changelog="https://github.com/joke2k/faker/raw/master/CHANGELOG.md" distfiles="${PYPI_SITE}/f/faker/faker-${version}.tar.gz" -checksum=be0e548352c1be6f6d9c982003848a0d305868f160bb1fb7f945acffc347e676 +checksum=9b01019c1ddaf2253ca2308c0472116e993f4ad8fc9905f82fa965e0c6f932e9 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template index 9ac05207f14..7226522fa5c 100644 --- a/srcpkgs/python3-Markdown/template +++ b/srcpkgs/python3-Markdown/template @@ -1,7 +1,7 @@ # Template file for 'python3-Markdown' pkgname=python3-Markdown -version=3.4.4 -revision=2 +version=3.6 +revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/Python-Markdown/markdown" distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz" -checksum=225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 +checksum=ed4f41f6daecbeeb96e576ce414c41d2d876daa9a16cb35fa8ed8c2ddfad0224 conflicts="python-Markdown>=0" do_check() { diff --git a/srcpkgs/python3-Pyphen/template b/srcpkgs/python3-Pyphen/template index 2ad173f7a65..37add8bb67b 100644 --- a/srcpkgs/python3-Pyphen/template +++ b/srcpkgs/python3-Pyphen/template @@ -1,6 +1,6 @@ # Template file for 'python3-Pyphen' pkgname=python3-Pyphen -version=0.16.0 +version=0.17.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-flit_core" @@ -11,4 +11,4 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later, LGPL-2.1-or-later, MPL-1.1" homepage="https://www.courtbouillon.org/pyphen" distfiles="https://github.com/Kozea/Pyphen/archive/refs/tags/${version}.tar.gz" -checksum=56be4c04170515976c4c35f391d7e778fe2678dd5d0f3fd540c03394d48ee1dd +checksum=979c44043b71a6f0725e2d0ff0f6b57b49ae1dfc623b27ee18914d6ef4733c32 diff --git a/srcpkgs/python3-WeasyPrint/template b/srcpkgs/python3-WeasyPrint/template index ad8ba2021f3..cbf9dc00bb5 100644 --- a/srcpkgs/python3-WeasyPrint/template +++ b/srcpkgs/python3-WeasyPrint/template @@ -1,10 +1,10 @@ # Template file for 'python3-WeasyPrint' pkgname=python3-WeasyPrint -version=62.3 +version=63.0 revision=1 build_style=python3-pep517 -_runtime_deps="fonttools python3-Pillow python3-cssselect2 python3-html5lib python3-cffi - python3-Pyphen python3-pydyf glib pango" +_runtime_deps="fonttools python3-Pillow python3-cssselect2 python3-html5lib + python3-cffi python3-Pyphen python3-pydyf python3-tinyhtml5 glib pango" hostmakedepends="python3-poetry-core python3-flit_core ${_runtime_deps}" depends="${_runtime_deps}" checkdepends="python3-pytest-flake8 python3-pytest-xdist python3-pytest-isort @@ -14,5 +14,5 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://weasyprint.org" distfiles="https://github.com/Kozea/WeasyPrint/archive/refs/tags/v${version}.tar.gz" -checksum=0cde626b384b09344d4302e97613129c17c29bf346a0c2d5778693348bb965ce +checksum=1eade2c8a0fc33baea72a37ef5bb094cd473fbf20e5059caa6869a5f6881c812 make_check=no # Tests are broken on flake8 >= v5.x diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template index ff18966e19f..d1c4e0f3475 100644 --- a/srcpkgs/python3-argcomplete/template +++ b/srcpkgs/python3-argcomplete/template @@ -1,6 +1,6 @@ # Template file for 'python3-argcomplete' pkgname=python3-argcomplete -version=3.4.0 +version=3.5.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://github.com/kislyuk/argcomplete" changelog="https://raw.githubusercontent.com/kislyuk/argcomplete/develop/Changes.rst" distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz" -checksum=c2abcdfe1be8ace47ba777d4fce319eb13bf8ad9dace8d085dcad6eded88057f +checksum=eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4 do_check() { # pytest is not supported diff --git a/srcpkgs/python3-b2sdk/template b/srcpkgs/python3-b2sdk/template index 4af97676d7a..0eb9eebc63e 100644 --- a/srcpkgs/python3-b2sdk/template +++ b/srcpkgs/python3-b2sdk/template @@ -1,6 +1,6 @@ # Template file for 'python3-b2sdk' pkgname=python3-b2sdk -version=2.5.1 +version=2.6.0 revision=1 build_style=python3-pep517 hostmakedepends="python3 python3-build python3-packaging python3-pdm-backend python3-setuptools python3-setuptools_scm python3-wheel" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://pypi.org/project/b2sdk" distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz" -checksum=fb75c831d6ea875522e78f0c42b784771dc31e6bb64f3eb9f379bdc85eb35a3f +checksum=626ef3a81989479a7b1371c8cd868c95e21cc5e0b074647443a43895325bb9e2 replaces="python-b2sdk>=0" # Tests require an application key make_check=no diff --git a/srcpkgs/python3-cachetools/template b/srcpkgs/python3-cachetools/template index c97ecbadf54..b1170a6cc4d 100644 --- a/srcpkgs/python3-cachetools/template +++ b/srcpkgs/python3-cachetools/template @@ -1,6 +1,6 @@ # Template file for 'python3-cachetools' pkgname=python3-cachetools -version=5.4.0 +version=5.5.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/tkem/cachetools/" changelog="https://raw.githubusercontent.com/tkem/cachetools/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/c/cachetools/cachetools-${version}.tar.gz" -checksum=b8adc2e7c07f105ced7bc56dbb6dfbe7c4a00acce20e2227b3f355be89bc6827 +checksum=2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-chess/template b/srcpkgs/python3-chess/template index cb36b5bfbf9..8ab3feba55b 100644 --- a/srcpkgs/python3-chess/template +++ b/srcpkgs/python3-chess/template @@ -1,6 +1,6 @@ # Template file for 'python3-chess' pkgname=python3-chess -version=1.11.0 +version=1.11.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,4 +12,4 @@ license="GPL-3.0-or-later" homepage="https://github.com/niklasf/python-chess" changelog="https://raw.githubusercontent.com/niklasf/python-chess/master/CHANGELOG.rst" distfiles="https://github.com/niklasf/python-chess/archive/refs/tags/v${version}.tar.gz" -checksum=1052b3adc514e1857893a6648d5c2e874703cd94d5d66d3c65453d0efe15c42c +checksum=31020e16267f88b48b47c028bd61125d673324b50aded460a3375c40c3231ca6 diff --git a/srcpkgs/python3-cups/template b/srcpkgs/python3-cups/template index 0237529625c..9f5831fece0 100644 --- a/srcpkgs/python3-cups/template +++ b/srcpkgs/python3-cups/template @@ -1,7 +1,7 @@ # Template file for 'python3-cups' pkgname=python3-cups -version=2.0.1 -revision=6 +version=2.0.4 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel cups-devel" @@ -12,5 +12,5 @@ license="GPL-2.0-or-later" homepage="https://pypi.org/project/pycups/" changelog="https://raw.githubusercontent.com/OpenPrinting/pycups/master/NEWS" distfiles="${PYPI_SITE}/p/pycups/pycups-${version}.tar.gz" -checksum=57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90 +checksum=843e385c1dbf694996ca84ef02a7f30c28376035588f5fbeacd6bae005cf7c8d make_check=no # needs to connect to a running cups server diff --git a/srcpkgs/python3-dnsrecon/template b/srcpkgs/python3-dnsrecon/template index 3a353c3e1cf..9b983719d1a 100644 --- a/srcpkgs/python3-dnsrecon/template +++ b/srcpkgs/python3-dnsrecon/template @@ -1,16 +1,15 @@ # Template file for 'python3-dnsrecon' pkgname=python3-dnsrecon -version=1.2.0 +version=1.3.1 revision=1 build_style=python3-pep517 make_check_args="-k not(test_zone_transfer)" hostmakedepends="python3-wheel" -depends="python3 python3-netaddr python3-dnspython python3-lxml" -checkdepends="${depends} python3-flake8 python3-pyflakes python3-pytest" +depends="python3 python3-netaddr python3-dnspython python3-lxml python3-requests python3-loguru" +checkdepends="${depends} python3-pytest" short_desc="DNS enumeration script" -maintainer="Jason Elswick " +maintainer="Jason Elswick " license="GPL-2.0-only" homepage="https://github.com/darkoperator/dnsrecon" distfiles="https://github.com/darkoperator/dnsrecon/archive/refs/tags/${version}.tar.gz" -checksum=76fe1d5f776116060bec93b296874a8f81606de3a58b5f926d8a2fbada74fe8a -make_check=no # requires python3-pytest >=8.0.0 +checksum=41c969d70f389265be8662d307e3145e9a09ab4f75930c721cd32893a63e52d2 diff --git a/srcpkgs/python3-httpcore/template b/srcpkgs/python3-httpcore/template index 932c04144f5..cb309d34154 100644 --- a/srcpkgs/python3-httpcore/template +++ b/srcpkgs/python3-httpcore/template @@ -1,6 +1,6 @@ # Template file for 'python3-httpcore' pkgname=python3-httpcore -version=1.0.6 +version=1.0.7 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core hatchling hatch-fancy-pypi-readme" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://www.encode.io/httpcore/" changelog="https://raw.githubusercontent.com/encode/httpcore/master/CHANGELOG.md" distfiles="https://github.com/encode/httpcore/archive/refs/tags/$version.tar.gz" -checksum=c17be5ee13c8be65bbcba4f5e7b512bd69c3382d64552841988799b5261b6cfe +checksum=f1826de42becefb334468cc3dd470601352e6c8c7b63d713e73b8073086ecb8b post_install() { vlicense LICENSE.md diff --git a/srcpkgs/python3-jsonpatch/template b/srcpkgs/python3-jsonpatch/template new file mode 100644 index 00000000000..4b8a4cbb4d3 --- /dev/null +++ b/srcpkgs/python3-jsonpatch/template @@ -0,0 +1,22 @@ +# Template file for 'python3-jsonpatch' +pkgname=python3-jsonpatch +version=1.33 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools python3-pypandoc" +depends="python3-jsonpointer" +checkdepends="$depends" +short_desc="Apply JSON Patches according to RFC 6902" +maintainer="Arjan Mossel " +license="BSD-3-Clause" +homepage="https://github.com/stefankoegl/python-json-patch" +distfiles="https://github.com/stefankoegl/python-json-patch/archive/v${version}.tar.gz" +checksum=c0163a2703dd8fa6be9c3018bcff6723bdfb240c8d56fb62d0673043cf647cda + +do_check() { + python -m unittest +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python3-loguru/template b/srcpkgs/python3-loguru/template new file mode 100644 index 00000000000..734ceb1d765 --- /dev/null +++ b/srcpkgs/python3-loguru/template @@ -0,0 +1,17 @@ +# Template file for 'python3-loguru' +pkgname=python3-loguru +version=0.7.2 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core python3-setuptools" +depends="python3" +short_desc="Python logging made (stupidly) simple" +maintainer="Jason Elswick " +license="MIT" +homepage="https://github.com/Delgan/loguru" +distfiles="https://github.com/Delgan/loguru/archive/refs/tags/${version}.tar.gz" +checksum=2b3517ef6941a3bb24ed108074194041b3de429d5d43fe9d51359f4abdd8bad5 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template index c455be02b0a..ba5f0a40fd8 100644 --- a/srcpkgs/python3-msgpack/template +++ b/srcpkgs/python3-msgpack/template @@ -1,7 +1,7 @@ # Template file for 'python3-msgpack' # Please ensure this version works with 'borg' before bumping! pkgname=python3-msgpack -version=1.0.8 +version=1.1.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,4 +14,4 @@ license="Apache-2.0" homepage="https://github.com/msgpack/msgpack-python" changelog="https://raw.githubusercontent.com/msgpack/msgpack-python/main/ChangeLog.rst" distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz" -checksum=95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3 +checksum=dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e diff --git a/srcpkgs/python3-networkx/template b/srcpkgs/python3-networkx/template index 68b46481b10..0460de43b26 100644 --- a/srcpkgs/python3-networkx/template +++ b/srcpkgs/python3-networkx/template @@ -1,6 +1,6 @@ # Template file for 'python3-networkx' pkgname=python3-networkx -version=3.3 +version=3.4.2 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://networkx.org" changelog="https://github.com/networkx/networkx/raw/main/doc/release/release_${version}.rst" distfiles="${PYPI_SITE}/n/networkx/networkx-${version}.tar.gz" -checksum=0c127d8b2f4865f59ae9cb8aafcd60b5c70f3241ebd66f7defad7c4ab90126c9 +checksum=307c3669428c5362aab27c8a1260aa8f47c4e91d3891f48be0141738d8d053e1 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python3-objgraph/template b/srcpkgs/python3-objgraph/template index 5e9c5d53e09..6cb614476a5 100644 --- a/srcpkgs/python3-objgraph/template +++ b/srcpkgs/python3-objgraph/template @@ -1,6 +1,6 @@ # Template file for 'python3-objgraph' pkgname=python3-objgraph -version=3.6.1 +version=3.6.2 revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://mg.pov.lt/objgraph/" distfiles="${PYPI_SITE}/o/objgraph/objgraph-${version}.tar.gz" -checksum=fe96c74147bbcaae8665b396e5388bdcc3197deebba4e6381f05202ee5b453a7 +checksum=00b9f2f40f7422e3c7f45a61c4dafdaf81f03ff0649d6eaec866f01030e51ad8 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-orjson/template b/srcpkgs/python3-orjson/template index 60e33348eef..0b8e5137fd5 100644 --- a/srcpkgs/python3-orjson/template +++ b/srcpkgs/python3-orjson/template @@ -1,6 +1,6 @@ # Template file for 'python3-orjson' pkgname=python3-orjson -version=3.10.7 +version=3.10.11 revision=1 build_style=python3-pep517 build_helper="rust" @@ -13,7 +13,7 @@ license="Apache-2.0 OR MIT" homepage="https://github.com/ijl/orjson" changelog="https://raw.githubusercontent.com/ijl/orjson/master/CHANGELOG.md" distfiles="https://github.com/ijl/orjson/archive/refs/tags/${version}.tar.gz" -checksum=82794bd7a67caf8ba45f6c157249bab32a1651ae188f2bd8f8af8ced3e16042f +checksum=ee6953bbbb44ad22483dbe7b548a5c902e231c7413fc0c20905885a690b50c43 post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/python3-pdm-backend/template b/srcpkgs/python3-pdm-backend/template index bfe999ba290..38dd9b4c8f4 100644 --- a/srcpkgs/python3-pdm-backend/template +++ b/srcpkgs/python3-pdm-backend/template @@ -1,6 +1,6 @@ # Template file for 'python3-pdm-backend' pkgname=python3-pdm-backend -version=2.4.2 +version=2.4.3 revision=1 build_style=python3-pep517 hostmakedepends="python3 python3-build python3-packaging" @@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://pypi.org/project/pdm-backend" distfiles="${PYPI_SITE}/p/pdm_backend/pdm_backend-${version}.tar.gz" -checksum=1f833e527ae172f34b4b84e2fcf1f65859a2a5ca746e496d8313b3ea6539969f \ No newline at end of file +checksum=dbd9047a7ac10d11a5227e97163b617ad5d665050476ff63867d971758200728 \ No newline at end of file diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index c596978dd4d..fbc90eb0c88 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv -version=2024.0.3 +version=2024.4.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/pypa/pipenv" changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.md" distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz" -checksum=0226ed63c81725117ed284bd58eb07e64207dc0c3fc8b52ead0ab2db91321870 +checksum=87b82407a9e2de3cf32a742c131708d7460d5985076c6a9b3c11d774d2929fb1 conflicts="python-pipenv>=0" make_check=no # tests are not contained in release tarball diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template index 322e18a0bb6..acc53410c13 100644 --- a/srcpkgs/python3-plotly/template +++ b/srcpkgs/python3-plotly/template @@ -1,6 +1,6 @@ # Template file for 'python3-plotly' pkgname=python3-plotly -version=5.22.0 +version=5.24.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ license="MIT" homepage="https://plot.ly/python/" changelog="https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md" distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz" -checksum=859fdadbd86b5770ae2466e542b761b247d1c6b49daed765b95bb8c7063e7469 +checksum=dbc8ac8339d248a4bcc36e08a5659bacfe1b079390b8953533f4eb22169b4bae make_check=no # no tests are shipped post_install() { diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template index a5753178e17..cf5f0e5df70 100644 --- a/srcpkgs/python3-pwntools/template +++ b/srcpkgs/python3-pwntools/template @@ -1,6 +1,6 @@ # Template file for 'python3-pwntools' pkgname=python3-pwntools -version=4.13.0 +version=4.13.1 revision=1 build_style=python3-module make_install_args="--only-use-pwn-command" @@ -16,7 +16,7 @@ maintainer="Leah Neukirchen " license="MIT, BSD-2-Clause" homepage="https://github.com/Gallopsled/pwntools" distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz" -checksum=1d5ca25383ec10fb64e28d142c1d868f91ea1c53a93d3531d3015d830828d3c3 +checksum=b3322725fb5031dc30965e3855073608d9abf74d2abf97a72c67d44aadfce37c post_install() { rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md diff --git a/srcpkgs/python3-pyproject-api/template b/srcpkgs/python3-pyproject-api/template index 7f8015a95d2..5570e6d92e9 100644 --- a/srcpkgs/python3-pyproject-api/template +++ b/srcpkgs/python3-pyproject-api/template @@ -1,8 +1,10 @@ # Template file for 'python3-pyproject-api' pkgname=python3-pyproject-api -version=1.7.1 +version=1.8.0 revision=1 build_style=python3-pep517 +# failing test, see: https://github.com/tox-dev/pyproject-api/issues/153 +make_check_args="--deselect tests/test_frontend_setuptools.py::test_setuptools_prepare_metadata_for_build_wheel" hostmakedepends="hatchling hatch-vcs" depends="python3-packaging" checkdepends="python3-pytest python3-pytest-mock python3-wheel" @@ -12,11 +14,11 @@ license="MIT" homepage="https://github.com/tox-dev/pyproject-api" changelog="https://raw.githubusercontent.com/tox-dev/pyproject-api/main/docs/changelog.rst" distfiles="${PYPI_SITE}/p/pyproject-api/pyproject_api-${version}.tar.gz" -checksum=7ebc6cd10710f89f4cf2a2731710a98abce37ebff19427116ff2174c9236a827 +checksum=77b8049f2feb5d33eefcc21b57f1e279636277a8ac8ad6b5871037b243778496 if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then # this test fails on CI - make_check_args="--deselect tests/test_frontend_setuptools.py::test_result_missing" + make_check_args+=" --deselect tests/test_frontend_setuptools.py::test_result_missing" fi post_install() { diff --git a/srcpkgs/python3-qtile-extras/template b/srcpkgs/python3-qtile-extras/template index a5c293671e4..edfc8b1e07f 100644 --- a/srcpkgs/python3-qtile-extras/template +++ b/srcpkgs/python3-qtile-extras/template @@ -1,6 +1,6 @@ # Template file for 'python3-qtile-extras' pkgname=python3-qtile-extras -version=0.28.1 +version=0.29.0 revision=1 build_style=python3-pep517 makedepends="python3-wheel python3-setuptools_scm" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/elParaguayo/qtile-extras" changelog="https://raw.githubusercontent.com/elParaguayo/qtile-extras/main/CHANGELOG" distfiles="${PYPI_SITE}/q/qtile-extras/qtile_extras-${version}.tar.gz" -checksum=679f6bf73fbdc0de95fb6946f6304d8e0b44215946dd486272fdfe139dde86dd +checksum=a039bf67331bf4aa7f7d79cd779793d2887ff97fdb940a338cfdd315991e3d12 # Tests require a lot of python modules that are not packaged make_check=no diff --git a/srcpkgs/python3-rapidfuzz/template b/srcpkgs/python3-rapidfuzz/template index b5f61c1dba9..9aa737a38ca 100644 --- a/srcpkgs/python3-rapidfuzz/template +++ b/srcpkgs/python3-rapidfuzz/template @@ -1,6 +1,6 @@ # Template file for 'python3-rapidfuzz' pkgname=python3-rapidfuzz -version=3.10.0 +version=3.10.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-scikit-build-core ninja" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/maxbachmann/rapidfuzz" changelog="https://github.com/rapidfuzz/RapidFuzz/releases" distfiles="${PYPI_SITE}/r/rapidfuzz/rapidfuzz-${version}.tar.gz" -checksum=6b62af27e65bb39276a66533655a2fa3c60a487b03935721c45b7809527979be +checksum=5a15546d847a915b3f42dc79ef9b0c78b998b4e2c53b252e7166284066585979 export CMAKE_ARGS="-DPython_INCLUDE_DIR:PATH=${XBPS_CROSS_BASE}/${py3_inc}" diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template index 09241d6e204..3539414a7ee 100644 --- a/srcpkgs/python3-regex/template +++ b/srcpkgs/python3-regex/template @@ -1,6 +1,6 @@ # Template file for 'python3-regex' pkgname=python3-regex -version=2024.7.24 +version=2024.9.11 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" @@ -12,7 +12,7 @@ license="CNRI-Python, Apache-2.0" homepage="https://github.com/mrabarnett/mrab-regex" changelog="https://raw.githubusercontent.com/mrabarnett/mrab-regex/hg/changelog.txt" distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz" -checksum=9cfd009eed1a46b27c14039ad5bbc5e71b6367c5b2e6d5f5da0ea91600817506 +checksum=6c188c307e8433bcb63dc1915022deb553b4203a70722fc542c363bf120a01fd do_check() { (cd build/lib* && python3 -m unittest regex/test_regex.py) diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template index da61b8e6ea5..e15d739b7e8 100644 --- a/srcpkgs/python3-rich/template +++ b/srcpkgs/python3-rich/template @@ -1,6 +1,6 @@ # Template file for 'python3-rich' pkgname=python3-rich -version=13.9.2 +version=13.9.4 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/willmcgugan/rich" distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz" -checksum=51a2c62057461aaf7152b4d611168f93a9fc73068f8ded2790f29fe2b5366d0c +checksum=439594978a49a09530cff7ebc4b5c7103ef57baf48d5ea3184f21d9a2befa098 make_check=extended # some checks only work on windows post_install() { diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template index bf0a76e1995..fe585ba5b7c 100644 --- a/srcpkgs/python3-ropgadget/template +++ b/srcpkgs/python3-ropgadget/template @@ -1,7 +1,7 @@ # Template file for 'python3-ropgadget' pkgname=python3-ropgadget -version=7.4 -revision=2 +version=7.5 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" @@ -12,4 +12,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/JonathanSalwan/ROPgadget" distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz" -checksum=a40626a32cf867d06192ef24e16221b2b7ba82e2ec84ab5bfdfb0b017559342f +checksum=c6b0a596c4a1d17ae928206119f6d8248d1607d6e577a205e75a7d298142accb diff --git a/srcpkgs/python3-ruamel.yaml.clib/template b/srcpkgs/python3-ruamel.yaml.clib/template index 93e83bae841..919fa2fb517 100644 --- a/srcpkgs/python3-ruamel.yaml.clib/template +++ b/srcpkgs/python3-ruamel.yaml.clib/template @@ -1,7 +1,7 @@ # Template file for 'python3-ruamel.yaml.clib' pkgname=python3-ruamel.yaml.clib -version=0.2.8 -revision=2 +version=0.2.12 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="http://yaml.readthedocs.io/" distfiles="${PYPI_SITE}/r/ruamel.yaml.clib/ruamel.yaml.clib-${version}.tar.gz" -checksum=beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512 +checksum=6c8fbb13ec503f99a91901ab46e0b07ae7941cd527393187039aec586fdfd36f export RUAMEL_NO_PIP_INSTALL_CHECK=1 make_check=no diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template index 64e799d5a2b..8ad820d1511 100644 --- a/srcpkgs/python3-sympy/template +++ b/srcpkgs/python3-sympy/template @@ -1,6 +1,6 @@ # Template file for 'python3-sympy' pkgname=python3-sympy -version=1.13.2 +version=1.13.3 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -14,7 +14,7 @@ license="BSD-3-Clause" homepage="https://sympy.org/" changelog="https://github.com/sympy/sympy/wiki/Release-Notes" distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz" -checksum=401449d84d07be9d0c7a46a64bd54fe097667d5e7181bfe67ec777be9e01cb13 +checksum=b27fd2c6530e0ab39e275fc9b683895367e51d5da91baa8d3d64db2565fec4d9 post_install() { vman doc/man/isympy.1 diff --git a/srcpkgs/python3-time-machine/template b/srcpkgs/python3-time-machine/template index 63d8d7a3c3f..8962b13ede0 100644 --- a/srcpkgs/python3-time-machine/template +++ b/srcpkgs/python3-time-machine/template @@ -1,6 +1,6 @@ # Template file for 'python3-time-machine' pkgname=python3-time-machine -version=2.15.0 +version=2.16.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/adamchainz/time-machine" changelog="https://raw.githubusercontent.com/adamchainz/time-machine/main/CHANGELOG.rst" distfiles="https://github.com/adamchainz/time-machine/archive/refs/tags/${version}.tar.gz" -checksum=1b8d9e36813cbaee65e554f0c104e09ac9cb2a54ac641e5dadd969550496f8ed +checksum=d2ed8ebef04133d69bce09114bbf66be0d404d725597874a644318af6e0b3e28 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-tinycss2/template b/srcpkgs/python3-tinycss2/template index 8196b935926..a505ecf742a 100644 --- a/srcpkgs/python3-tinycss2/template +++ b/srcpkgs/python3-tinycss2/template @@ -1,6 +1,6 @@ # Template file for 'python3-tinycss2' pkgname=python3-tinycss2 -version=1.3.0 +version=1.4.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-flit_core python3-webencodings" @@ -12,7 +12,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://www.courtbouillon.org/tinycss2" distfiles="${PYPI_SITE}/t/tinycss2/tinycss2-${version}.tar.gz" -checksum=152f9acabd296a8375fbca5b84c961ff95971fcfc32e79550c8df8e29118c54d +checksum=10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7 make_check=no # tests broken with flake8 >= v5.x post_install() { diff --git a/srcpkgs/python3-tinyhtml5/template b/srcpkgs/python3-tinyhtml5/template new file mode 100644 index 00000000000..4b9fa41598c --- /dev/null +++ b/srcpkgs/python3-tinyhtml5/template @@ -0,0 +1,17 @@ +# Template file for 'python3-tinyhtml5' +pkgname=python3-tinyhtml5 +version=2.0.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-poetry-core python3-flit_core" +depends="python3-webencodings" +short_desc="HTML parser based on the WHATWG HTML specification" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/CourtBouillon/tinyhtml5" +distfiles="${PYPI_SITE}/t/tinyhtml5/tinyhtml5-${version}.tar.gz" +checksum=086f998833da24c300c414d9fe81d9b368fd04cb9d2596a008421cbc705fcfcc + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python3-urwidgets/template b/srcpkgs/python3-urwidgets/template index 8c3a5a258c1..d09bc37323d 100644 --- a/srcpkgs/python3-urwidgets/template +++ b/srcpkgs/python3-urwidgets/template @@ -1,6 +1,6 @@ # Template file for 'python3-urwidgets' pkgname=python3-urwidgets -version=0.2.0 +version=0.2.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,9 +11,7 @@ license="MIT" homepage="https://github.com/AnonymouX47/urwidgets" changelog="https://github.com/AnonymouX47/urwidgets/releases" distfiles="https://github.com/AnonymouX47/urwidgets/releases/download/v$version/urwidgets-$version.tar.gz" -checksum=d41acf9d9f8d576cb580bc042919b209c5aeeb60e1f81052809c63f31c4e7688 -# No tests available -make_check=no +checksum=f9f2bcd2949da1105c287806dab773aa7bdf5852226cdb128aaf3004136f3eef post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template index 29d82b39977..9ef3ceca19e 100644 --- a/srcpkgs/python3-virtualenv/template +++ b/srcpkgs/python3-virtualenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-virtualenv' pkgname=python3-virtualenv -version=20.26.5 +version=20.27.1 revision=1 build_style=python3-pep517 make_check_args="--ignore tests/unit/seed/wheels/test_periodic_update.py @@ -16,7 +16,7 @@ license="MIT" homepage="https://virtualenv.pypa.io/" changelog="https://virtualenv.pypa.io/en/latest/changelog.html" distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz" -checksum=ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4 +checksum=142c6be10212543b32c6c45d3d3893dff89112cc588b7d0879ae5a1ec03a47ba alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3" post_install() { diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template index 04dff6db961..66cbf3aedb4 100644 --- a/srcpkgs/python3-waitress/template +++ b/srcpkgs/python3-waitress/template @@ -1,6 +1,6 @@ # Template file for 'python3-waitress' pkgname=python3-waitress -version=3.0.0 +version=3.0.2 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ maintainer="Andrew Benson " license="ZPL-2.1" homepage="https://github.com/Pylons/waitress" distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz" -checksum=005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1 +checksum=682aaaf2af0c44ada4abfb70ded36393f0e307f4ab9456a215ce0020baefc31f diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index 777e959a966..a7267a448be 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/srcpkgs/qalculate-gtk/template @@ -1,7 +1,7 @@ # Template file for 'qalculate-gtk' # NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-qt' pkgname=qalculate-gtk -version=5.2.0 +version=5.3.0 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config glib-devel" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://qalculate.github.io" changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz" -checksum=1a917fe5d5ca03e21a97308bac31f013d5459edd090ba20717eaf56259270dbd +checksum=2cbeeaa6c820644a08427c7dbf1273bf55a1eb28650ecf425e3a420612d79c9f diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template index 0d2af993fc2..547b7d406ad 100644 --- a/srcpkgs/qalculate-qt/template +++ b/srcpkgs/qalculate-qt/template @@ -1,7 +1,7 @@ # Template file for 'qalculate-qt' # NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk' pkgname=qalculate-qt -version=5.2.0 +version=5.3.0 revision=1 build_style=qmake hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://qalculate.github.io" changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz" -checksum=6daef548376d1a941515f3ee5c268ec97a64668474ff6c31e02890eee12f2b75 +checksum=535aa5513d15c97c953f853225390effd7a3875d2564abeeb8584addf43050a9 diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index 79c88a05dbf..de679ad5b76 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,9 +1,9 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=4.6.7 +version=5.0.1 revision=1 build_style=cmake -configure_args="-DQT6=ON -DSYSTEMD=OFF -DGUI=ON -DWEBUI=OFF" +configure_args="-DSYSTEMD=OFF -DGUI=ON -DWEBUI=OFF" hostmakedepends="pkg-config qt6-tools qt6-declarative-host-tools" makedepends="libtorrent-rasterbar-devel qt6-base-private-devel qt6-declarative-devel qt6-svg-devel" depends="qt6-svg" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://www.qbittorrent.org/" changelog="https://www.qbittorrent.org/news.php" distfiles="${SOURCEFORGE_SITE}/qbittorrent/qbittorrent-${version}.tar.xz" -checksum=bcf2dcf52a0186c3f5da2f1413453888654dc1aee5e4ad80e5a026764bc640c4 +checksum=03435c292091cc953ff078da8fd224b9e45074842ea72caa82a4ead72b402e69 CXXFLAGS=-std=gnu++17 post_configure() { # qbittorrent-nox diff --git a/srcpkgs/qed/template b/srcpkgs/qed/template index af4dc7c1da3..cebaadf0d8a 100644 --- a/srcpkgs/qed/template +++ b/srcpkgs/qed/template @@ -1,17 +1,17 @@ # Template file for 'qed' pkgname=qed -version=1.0.7 +version=2.0.1 revision=1 +_githash=63c68abd24218f78589fe86af8ce022b9a9f2fde build_style=gnu-makefile short_desc="UTF-8/Unicode-aware port of Rob Pike's QED editor for Unix" maintainer="Leah Neukirchen " license="Public Domain" # Usenix Tape -homepage="https://github.com/phonologus/QED" -distfiles="https://github.com/phonologus/QED/archive/v${version}.tar.gz" -checksum=78bf6b7217fd370079894e051d13dbdd388c655e2cbc78ed7b3a124de66eb893 +homepage="https://github.com/phonologus/qed-new" +distfiles="https://github.com/phonologus/qed-new/archive/${_githash}.tar.gz" +checksum=188d7a03f418ba4929d8d9b3e022187a0bad07fa2841a79e7f3b777ac3f2b3aa do_install() { - vbin qed - vman doc/qed.1 - vdoc doc/qed-tutorial.html + vbin a.out qed + vman qed.1 } diff --git a/srcpkgs/qemacs/template b/srcpkgs/qemacs/template index faa42f67978..182182e707e 100644 --- a/srcpkgs/qemacs/template +++ b/srcpkgs/qemacs/template @@ -1,8 +1,8 @@ # Template file for 'qemacs' pkgname=qemacs -version=6.1.1b +version=6.3.2 revision=1 -_githash=06b3d373bbcc52b51ccb438bf3cab38a49492ff0 +_githash=0e90c181078f3d85d0d44d985d541184223668e1 build_style=configure configure_args="--prefix=/usr --mandir=/usr/share/man --disable-x11 --disable-plugins" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/qemacs/qemacs" distfiles="https://github.com/qemacs/qemacs/archive/${_githash}.tar.gz" -checksum=89f8e9acc09ee51fa7d78c96a0e44bb1921616629d965aa7fc8cb696ffa0410f +checksum=dd61939fd2662ad7bf0ebb11d0490ac5e4fe8fa5c5bd00eae8aaf54ccd96b0c9 # make: *** No rule to make target '.objs/Linux-x86_64-riscv64-linux-gnu-gcc/libqhtml.a', needed by 'qe_g'. Stop. disable_parallel_build=yes diff --git a/srcpkgs/qps/template b/srcpkgs/qps/template index ed4272a7029..f5fa1b72d01 100644 --- a/srcpkgs/qps/template +++ b/srcpkgs/qps/template @@ -1,6 +1,6 @@ # Template file for 'qps' pkgname=qps -version=2.9.0 +version=2.10.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools perl qt6-base qt6-tools" @@ -10,4 +10,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/qps/archive/${version}.tar.gz" -checksum=d89c2f588fb42d5e5e959952ce16079754c2844274850defdd0c2e5558030cc5 +checksum=897edd082423f4507c6a28a0dafd0a49b9a542c7eeca54b3655f27f06b5a6424 diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template index 754d66be952..050eece6969 100644 --- a/srcpkgs/qpwgraph/template +++ b/srcpkgs/qpwgraph/template @@ -1,6 +1,6 @@ # Template file for 'qpwgraph' pkgname=qpwgraph -version=0.7.8 +version=0.8.0 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-declarative-host-tools" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later" homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph" changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog" distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz" -checksum=d3a98d78853431e906975e970a0ef69a6dfea806557d9c1c6c5f757490adff4b +checksum=1b6dab91515c0c2a04bf549ac647723b70ff1506465876a969a591d37e966d7e diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template index fb1adb72891..5518712acdf 100644 --- a/srcpkgs/qsv/template +++ b/srcpkgs/qsv/template @@ -1,11 +1,12 @@ # Template file for 'qsv' pkgname=qsv -version=0.133.1 +version=0.138.0 revision=1 archs="x86_64* i686* aarch64* arm*" # ring build_style=cargo configure_args="--features=feature_capable" -make_check_args="-- --skip=test_comments --skip=test_sample --skip=test_sort" # fails in i686 +make_check_args="-- --skip=test_comments --skip=test_sample --skip=test_sort + --skip=test_describegpt" hostmakedepends="pkg-config" makedepends="libzstd-devel" short_desc="CLI toolkit for CSV data-wrangling" @@ -14,7 +15,7 @@ license="Unlicense" homepage="https://qsv.dathere.com" changelog="https://raw.githubusercontent.com/jqnatividad/qsv/master/CHANGELOG.md" distfiles="https://github.com/jqnatividad/qsv/archive/refs/tags/${version}.tar.gz" -checksum=f2f59c07ea8d84d527641b6f6c2e1eeff114d04860d2904a2b85361ea62db204 +checksum=c53299dc56dbf7776a86d3802e928a8dc44a922b1bdaa1f1903d0ab8bb457201 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then XBPS_CROSS_RUSTFLAGS+=" -latomic" diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template new file mode 100644 index 00000000000..cf2fbc463e4 --- /dev/null +++ b/srcpkgs/qt-sudo/template @@ -0,0 +1,14 @@ +# Template file for 'qt-sudo' +pkgname=qt-sudo +version=2.0.1 +revision=1 +build_style=qmake +build_helper=qmake6 +hostmakedepends="qt6-base qt6-tools" +makedepends="qt6-base-devel" +short_desc="Clone of LXQt sudo tool, without LXQt libs" +maintainer="toadwastoast " +license="GPL-2.0-or-later" +homepage="https://github.com/aarnt/qt-sudo" +distfiles="https://github.com/aarnt/qt-sudo/archive/v${version}.tar.gz" +checksum=d97f38b37f2f8e4411506bed361090415a5617ebd794a9de7d9b4bb606ece3a1 diff --git a/srcpkgs/qtcurve/template b/srcpkgs/qtcurve/template index 19a4d792d66..0af687a5fa0 100644 --- a/srcpkgs/qtcurve/template +++ b/srcpkgs/qtcurve/template @@ -12,7 +12,7 @@ makedepends="libxcb-devel libX11-devel qt5-devel gtk+-devel short_desc="Configurable set of widget styles for KDE and Gtk" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://quickgit.kde.org/?p=qtcurve.git" +homepage="https://github.com/KDE/qtcurve" distfiles="https://github.com/KDE/qtcurve/archive/${version}.tar.gz" checksum=fbfdafdac90d4c540dd55a4accfecfc3a17c1f532c5241e28003348beafaca15 nocross="tries to execute a helper binary compiled for target on the host" diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template index bbf9dd6887c..8266a2bd107 100644 --- a/srcpkgs/qterminal/template +++ b/srcpkgs/qterminal/template @@ -1,6 +1,6 @@ # Template file for 'qterminal' pkgname=qterminal -version=2.0.1 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools perl" @@ -10,4 +10,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/qterminal/archive/${version}.tar.gz" -checksum=d9d9080ca6da96473c83c17a65ec66d28e104d13bdc50bc9c265d1d19026cf7c +checksum=c29bbe0ee7d33ed31215a7118ba040cfb7b027005d12438d6e8285f0207da770 diff --git a/srcpkgs/qtermwidget-qt6/template b/srcpkgs/qtermwidget-qt6/template index 762237943f7..6477664619d 100644 --- a/srcpkgs/qtermwidget-qt6/template +++ b/srcpkgs/qtermwidget-qt6/template @@ -1,6 +1,6 @@ # Template file for 'qtermwidget' pkgname=qtermwidget-qt6 -version=2.0.1 +version=2.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base qt6-tools" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/qtermwidget/archive/${version}.tar.gz" -checksum=a1384a2c1c943d98f1856cb82f8cdf9e93a05f773d00f47874b5bdec0447a39e +checksum=b7c4cc5cd771a9aaeca48002cbf8f9737748a2f0b30bdfb05aaab795e85a2e97 qtermwidget-qt6-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/qtile/template b/srcpkgs/qtile/template index 61c7e3d8217..7626614a390 100644 --- a/srcpkgs/qtile/template +++ b/srcpkgs/qtile/template @@ -1,6 +1,6 @@ # Template file for 'qtile' pkgname=qtile -version=0.28.1 +version=0.29.0 revision=1 build_style=python3-pep517 _wlroots=0.17 @@ -14,7 +14,7 @@ license="MIT" homepage="http://www.qtile.org/" changelog="https://raw.githubusercontent.com/qtile/qtile/master/CHANGELOG" distfiles="${PYPI_SITE}/q/qtile/qtile-${version}.tar.gz" -checksum=89b62e177afb5f4e135e45880435e5d1a6430c812277167ec87eca9e270badf5 +checksum=30200cfd2a2e6624aa414fae845c6e4184231418e7358e62d1ea902334198b62 post_install() { vinstall resources/qtile.desktop 644 usr/share/xsessions diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template index 9b701a64338..db44208ee82 100644 --- a/srcpkgs/qtractor/template +++ b/srcpkgs/qtractor/template @@ -1,8 +1,8 @@ # Template file for 'qtractor' pkgname=qtractor -version=1.2.0 +version=1.4.0 revision=1 -_clap_tag=1.2.1 +_clap_tag=1.2.2 _vst3sdk_tag=3.7.12_build_20 create_wrksrc=yes build_wrksrc="qtractor" @@ -24,8 +24,8 @@ distfiles="https://github.com/rncbc/qtractor/archive/refs/tags/v${version}.tar.g https://github.com/steinbergmedia/vst3_base/archive/refs/tags/v${_vst3sdk_tag}.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz https://github.com/steinbergmedia/vst3_pluginterfaces/archive/refs/tags/v${_vst3sdk_tag}.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz https://github.com/steinbergmedia/vst3_public_sdk/archive/refs/tags/v${_vst3sdk_tag}.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz" -checksum="e730e51e1532adbfb109cbc82ad10eb43734c9508455576941f67e55ef74ec40 - 04fc5a94d0966e9ab9d9e78590250e692da49a716e2c9cc719ba75b45bff9c25 +checksum="66ce76398a3ebe8f7c40da69b1582920d5ae637366a033e56c3c9624b274160f + 1472bfe3b9f4eac3d7aca57d4a528f0c39709a2af82900253ce6a5b86e0b60e1 1cafc2665f6e77c29303f7d11fd95af328f915bdd683a4e13058b8fca720d15f 1d863daf5a2aae7406b4a2cebdb5c42778d483358f81fa6fc9a5fecef3aa7ea3 0843f95c02a8f70658b6b1a2c96508a65b7be5093b0427e1d2074d1395fec381 diff --git a/srcpkgs/qtxdg-tools/template b/srcpkgs/qtxdg-tools/template index bd7a253c952..921d9d60f34 100644 --- a/srcpkgs/qtxdg-tools/template +++ b/srcpkgs/qtxdg-tools/template @@ -1,6 +1,6 @@ # Template file for 'qtxdg-tools' pkgname=qtxdg-tools -version=4.0.0 +version=4.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt6-base" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="http://www.lxqt.org" changelog="https://github.com/lxqt/qtxdg-tools/raw/master/CHANGELOG" distfiles="https://github.com/lxqt/qtxdg-tools/archive/${version}.tar.gz" -checksum=4c893e70d61b180717c17bf4097ac748d4d84360eb8611daf27e8f3631967981 +checksum=4b8ee37c011721f5a765215703350fed8ca9c232e1f8209171ddef43a1a47dab qtxdg-tools-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index f768ae607c5..305ae603be9 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,6 +1,6 @@ # Template file for 'qutebrowser' pkgname=qutebrowser -version=3.2.1 +version=3.3.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools asciidoc" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://qutebrowser.org/" changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc" distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz" -checksum=02a7af2a6c5db38d87b225b0b8412c80d9838335f32d0e8a38f6d7fbcd38897d +checksum=aadb64accc730bc9a15ce341c9a0580b1f36383ed4874f54d31ce1dabe94e17a nostrip=yes # testing requires unpackaged plugins: # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template index f8a74fd559a..e1f0acc4c38 100644 --- a/srcpkgs/racket/template +++ b/srcpkgs/racket/template @@ -1,6 +1,6 @@ # Template file for 'racket' pkgname=racket -version=8.14 +version=8.15 revision=1 archs="aarch64* armv6* armv7* i686* x86_64*" build_wrksrc=src @@ -15,7 +15,7 @@ maintainer="Andrea Brancaleoni " license="LGPL-3.0-only, MIT" homepage="http://racket-lang.org/" distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz" -checksum=aab8cc0db336ed2d382803c708ad55a95fc52a4436c912f616f7c49d4845ae2c +checksum=602b848459daf1b2222a46a9094e85ae2d28e480067219957fa46af8400e1233 nostrip=yes patch_args="-Np2" diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index b891ec18851..b8d4344031f 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,6 +1,6 @@ # Template file for 'radare2' pkgname=radare2 -version=5.9.4 +version=5.9.6 revision=1 build_style=meson configure_args="-Denable_tests=false -Duse_sys_capstone=true @@ -15,7 +15,7 @@ maintainer="yosh " license="LGPL-3.0-only" homepage="https://www.radare.org" distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz" -checksum=4b194a73ce8dfe12c0b8c70cf6af449260119588ceacc205ac95570bbf17cdd3 +checksum=91a4475c16eb17015080b9b688e17e666d1982b0727e7aea71ddf0a7ad2ccd0d case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";; diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index 1fe4c5b7c1b..69280f239d6 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -1,20 +1,20 @@ # Template file for 'radicale' pkgname=radicale -version=3.2.2 +version=3.3.0 revision=1 -build_style=python3-module +build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt python3-defusedxml apache-htpasswd" checkdepends="${depends} python3-pytest python3-pytest-flake8 python3-isort python3-pytest-cov python3-waitress" short_desc="Complete calendar and contact storing and manipulating solution" -maintainer="Orphaned " +maintainer="Jason Elswick " license="GPL-3.0-or-later" homepage="https://radicale.org" changelog="https://raw.githubusercontent.com/Kozea/Radicale/master/CHANGELOG.md" distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz" -checksum=d738a27c7d16720602a58355ec371ef832d7f4e6bf274daff7ed55b1bb4e0944 +checksum=7080b96c670b954182202a5d77484d447607cf907b6f6bf4051f257b6d182164 conf_files=" /etc/radicale/config /etc/radicale/rights" @@ -28,12 +28,6 @@ radicale_homedir="/var/lib/radicale" radicale_descr="Radicale user" replaces="radicale2<3.0.6" -do_check() { - # install the package to test_install directory for testing - python3 setup.py install --root="${PWD}/test_install" - PYTHONPATH="${PWD}/test_install/${py3_sitelib}" pytest -c /dev/null -} - post_install() { vinstall config 644 etc/radicale/ vinstall rights 640 etc/radicale/ diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template index df392a6aebe..f7991c5a1e0 100644 --- a/srcpkgs/rakudo/template +++ b/srcpkgs/rakudo/template @@ -1,6 +1,6 @@ # Template file for 'rakudo' pkgname=rakudo -version=2024.07 +version=2024.10 revision=1 build_style=configure make_check_target=test @@ -32,7 +32,7 @@ license="Artistic-2.0" homepage="https://rakudo.org" changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog" distfiles="https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz" -checksum=e1a92f19c3e987c84bf089947e5f17b498069949bcad1163cff516586764ae3c +checksum=fceb6aa9493c3c870d769152b3fac362af68b8f09a44da681f166eff54ec9050 case "$XBPS_TARGET_MACHINE" in arm*|aarch64*) disable_parallel_build=yes;; esac diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template index fd8366e7587..4db2989795f 100644 --- a/srcpkgs/ranger/template +++ b/srcpkgs/ranger/template @@ -1,16 +1,16 @@ # Template file for 'ranger' pkgname=ranger -version=1.9.3 -revision=5 +version=1.9.4 +revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools" makedepends="python3-devel" depends="python3" checkdepends="python3-pytest" short_desc="File manager with an ncurses frontend written in Python" -maintainer="Orphaned " +maintainer="André L. C. Moreira " license="GPL-3.0-only" homepage="https://ranger.github.io" changelog="https://raw.githubusercontent.com/ranger/ranger/master/CHANGELOG.md" -distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=ce088a04c91c25263a9675dc5c43514b7ec1b38c8ea43d9a9d00923ff6cdd251 +distfiles="https://github.com/ranger/ranger/archive/refs/tags/v${version}.tar.gz" +checksum=7ad75e0d1b29087335fbb1691b05a800f777f4ec9cba84faa19355075d7f0f89 diff --git a/srcpkgs/rapidfuzz-cpp/template b/srcpkgs/rapidfuzz-cpp/template index 89e4332221e..416dea2001e 100644 --- a/srcpkgs/rapidfuzz-cpp/template +++ b/srcpkgs/rapidfuzz-cpp/template @@ -1,6 +1,6 @@ # Template file for 'rapidfuzz-cpp' pkgname=rapidfuzz-cpp -version=3.0.5 +version=3.1.1 revision=1 build_style=cmake short_desc="Rapid fuzzy string matching in C++ using the Levenshtein Distance" @@ -9,7 +9,7 @@ license="MIT" homepage="https://github.com/maxbachmann/rapidfuzz-cpp" changelog="https://github.com/rapidfuzz/rapidfuzz-cpp/releases" distfiles="https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${version}.tar.gz" -checksum=e32936cc66333a12f659553b5fdd6d0c22257d32ac3b7a806ac9031db8dea5a1 +checksum=5a72811a9f5a890c69cb479551c19517426fb793a10780f136eb482c426ec3c8 post_install() { vlicense LICENSE diff --git a/srcpkgs/rdrview/template b/srcpkgs/rdrview/template index 5945505a52e..120daf70502 100644 --- a/srcpkgs/rdrview/template +++ b/srcpkgs/rdrview/template @@ -1,6 +1,6 @@ # Template file for 'rdrview' pkgname=rdrview -version=0.1.2 +version=0.1.3 revision=1 build_style=gnu-makefile makedepends="libcurl-devel libseccomp-devel libxml2-devel" @@ -9,4 +9,4 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/eafer/rdrview" distfiles="https://github.com/eafer/rdrview/archive/refs/tags/v${version}.tar.gz" -checksum=1c328d91730abde45c352c5879fa51ce8c1918609826f0f0485d3bd895bfb50b +checksum=d0c78793f94867e9251fc3fe373026ae6ec14c02482572f5d03399891a0a83cc diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 274ae6da003..3b3da1d0ee6 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20240929 +version=0.1.20241028 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -208,6 +208,7 @@ replaces=" gx<=0.14.3_1 hangups<=0.4.18_2 hardinfo<=0.5.1_14 + hikari<=2.3.3_3 httperf<=0.9.0_9 icecat-i18n-ach<=78.6.1_1 icecat-i18n-af<=78.6.1_1 @@ -813,6 +814,10 @@ replaces=" wireshark-gtk<=3.0.7_1 wlroots0.14-devel<=0.14.1_1 wlroots0.14<=0.14.1_1 + wlroots0.15-devel<=0.15.1_3 + wlroots0.15<=0.15.1_3 + wlroots0.16-devel<=0.16.2_3 + wlroots0.16<=0.16.2_3 wmii<=3.9.2_8 xcdroast<=1.19_1 xdebug8.0<=3.2.1_1 diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template index 09cbac4ddfc..07143b0a379 100644 --- a/srcpkgs/restic/template +++ b/srcpkgs/restic/template @@ -1,18 +1,25 @@ # Template file for 'restic' pkgname=restic -version=0.17.1 +version=0.17.3 revision=1 build_style=go go_import_path=github.com/restic/restic go_package="${go_import_path}/cmd/restic" go_ldflags="-X 'main.version=${version} (Void Linux)'" +checkdepends="tar python3" short_desc="Backup solution written in Go" maintainer="Florian Eich " license="BSD-2-Clause" homepage="https://restic.net/" changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md" distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz" -checksum=cba3a5759690d11dae4b5620c44f56be17a5688e32c9856776db8a9a93d6d59a +checksum=bf0dd73edfae531c24070e2e7833938613f7b179ed165e6b681098edfdf286c8 + +if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then + make_check_args="-skip (^TestMount$|^TestMountSameTimestamps$|^TestRestoreWithPermissionFailure$" + make_check_args+="|^TestRestoreLocalLayout$|^TestCheckRestoreNoLock$|^TestBackupErrors$" + make_check_args+="|^TestArchiverErrorReporting$|^TestScannerError$)" +fi post_install() { vlicense LICENSE diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 7292681e4e3..0999380657c 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,20 +1,19 @@ # Template file for 'retroarch' pkgname=retroarch version=1.19.1 -revision=3 +revision=4 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking - --enable-udev --disable-builtinflac --disable-builtinglslang - --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib - $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack) + --enable-udev --disable-builtinflac --enable-systemmbedtls + --disable-builtinbearssl --disable-builtinzlib + $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable jack) $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt) $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)" conf_files="/etc/retroarch.cfg" hostmakedepends="pkg-config" makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg6-devel) $(vopt_if flac libflac-devel) - $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel) - $(vopt_if pulseaudio pulseaudio-devel) + $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader-devel) $(vopt_if x11 'libXext-devel libXinerama-devel libXxf86vm-devel')" depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)" @@ -26,11 +25,10 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" checksum=504a3a8a6e5861eb43a61be8339f61183e7ea940c1ff68ac2a2f57d35c67f8ff -build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11" -build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11" +build_options="ffmpeg flac glcore gles2 jack neon pulseaudio qt5 sdl2 vulkan wayland x11" +build_options_default="ffmpeg flac glcore pulseaudio sdl2 vulkan wayland x11" desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+" -desc_option_glslang="Enable support for GLSL shaders" desc_option_neon="Enable support for ARM Neon SIMD extension" vopt_conflict glcore gles2 # gles2 disables glcore support @@ -42,9 +40,6 @@ else fi if [ "$build_option_glcore" ]; then - if [ -z "$build_option_glslang" ]; then - msg_error "$pkgname: 'glcore' option requires 'glslang'.\n" - fi configure_args+=" --enable-opengl_core" else configure_args+=" --disable-opengl_core" @@ -61,12 +56,6 @@ if [ "$build_option_qt5" ]; then fi fi -if [ "$build_option_vulkan" ]; then - if [ -z "$build_option_glslang" ]; then - msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n" - fi -fi - if [ "$build_option_wayland" ]; then if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n" diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template index a2512a1e165..9b8d7d4561a 100644 --- a/srcpkgs/rex/template +++ b/srcpkgs/rex/template @@ -1,11 +1,11 @@ # Template file for 'rex' pkgname=rex -version=1.14.3 +version=1.15.0 revision=1 build_style=perl-module hostmakedepends="perl perl-AWS-Signature4 perl-Clone-Choose perl-Data-Validate-IP perl-Devel-Caller perl-Digest-HMAC perl-Expect - perl-File-ShareDir-Install perl-Hash-Merge perl-IO-String perl-IO-Tty + perl-File-ShareDir-Install perl-Hash-Merge perl-IO-Tty perl-JSON-MaybeXS perl-LWP perl-Net-OpenSSH perl-Net-SFTP-Foreign perl-PadWalker perl-Parallel-ForkManager perl-Sort-Naturally perl-String-Escape perl-Term-ReadKey perl-Text-Glob @@ -21,7 +21,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="http://www.rexify.org/" distfiles="https://cpan.metacpan.org/authors/id/F/FE/FERKI/Rex-${version}.tar.gz" -checksum=027d3042ef940b67590e5989e96f22ae1e67ba744895c5dd3db569c05137025c +checksum=a02f2a1ec1d612cd12019adddb6b8971a437404b88ea31bb18f13a890128f3a7 post_install() { vinstall share/rex-tab-completion.bash 644 usr/share/bash-completion/completions rex diff --git a/srcpkgs/rio/template b/srcpkgs/rio/template index 327ff63a38e..44373e22e0f 100644 --- a/srcpkgs/rio/template +++ b/srcpkgs/rio/template @@ -1,6 +1,6 @@ # Template file for 'rio' pkgname=rio -version=0.1.16 +version=0.2.0 revision=1 build_style=cargo build_wrksrc="frontends/rioterm" @@ -13,7 +13,7 @@ license="MIT" homepage="https://raphamorim.io/rio/" changelog="https://raw.githubusercontent.com/raphamorim/rio/main/CHANGELOG.md" distfiles="https://github.com/raphamorim/rio/archive/refs/tags/v${version}.tar.gz" -checksum=5311753404c4475751a514305e4dbb75c565f386e5ccf66d8238f135c1cd786f +checksum=605ca1e5094119337223378e477236e7de7d4110473aefb7e51396dbd0e89a4c post_install() { vinstall ${wrksrc}/misc/logo.svg 644 usr/share/icons/hicolor/scalable/apps rio.svg diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template index 337cb5c5441..4cf4b236752 100644 --- a/srcpkgs/routinator/template +++ b/srcpkgs/routinator/template @@ -1,6 +1,6 @@ # Template file for 'routinator' pkgname=routinator -version=0.13.2 +version=0.14.0 revision=1 build_style=cargo depends="rsync" @@ -11,7 +11,7 @@ homepage="https://routinator.docs.nlnetlabs.nl/" changelog="https://raw.githubusercontent.com/NLnetLabs/routinator/main/Changelog.md" distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz" conf_files="/etc/routinator/routinator.conf" -checksum=77c3b74b508caabf4c59387480cda18b222d817fd70328f8c73a8fb45a774108 +checksum=861e90f395344be19880485185df47e8fd258cc583b82be702af660b466955cb system_accounts="_routinator" _routinator_homedir="/var/lib/routinator" make_dirs="/var/lib/routinator 0755 _routinator _routinator" diff --git a/srcpkgs/roxterm/template b/srcpkgs/roxterm/template index 94ab00d7dda..b878f9e7d3a 100644 --- a/srcpkgs/roxterm/template +++ b/srcpkgs/roxterm/template @@ -1,6 +1,6 @@ # Template file for 'roxterm' pkgname=roxterm -version=3.12.1 +version=3.15.2 revision=1 build_style=cmake hostmakedepends="ImageMagick glib-devel itstool librsvg-utils libtool @@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-3.0-only" homepage="https://github.com/realh/roxterm" changelog="https://raw.githubusercontent.com/realh/roxterm/master/debian/changelog" distfiles="https://github.com/realh/roxterm/archive/${version}.tar.gz" -checksum=9a662a00fe555ae9ff38301a1707a3432d8f678326062c98740f20827280a5aa +checksum=5d5c41ba3153e6c4b208219108b57dab6044169899ec06fef3d18b27fa6fb97c diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template index 3857c2915f9..0209e07ee07 100644 --- a/srcpkgs/rssguard/template +++ b/srcpkgs/rssguard/template @@ -1,6 +1,6 @@ # Template file for 'rssguard' pkgname=rssguard -version=4.7.3 +version=4.7.4 revision=1 build_style=cmake configure_args="-DNO_LITE=OFF" @@ -13,7 +13,7 @@ maintainer="mobinmob " license="GPL-3.0-only" homepage="https://github.com/martinrotter/rssguard" distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz" -checksum=3321c9ee595fd0362eaff618362621434f76538915f4cc03ac1d449464cecfee +checksum=2230f80a800171f8ef9f4085046b9a277eed0b059f13f194408a88df900306d4 post_install() { # Install rssguard icon manually diff --git a/srcpkgs/rtl_433/template b/srcpkgs/rtl_433/template index 075f2e5a4a9..4480abb4d0e 100644 --- a/srcpkgs/rtl_433/template +++ b/srcpkgs/rtl_433/template @@ -1,6 +1,6 @@ # Template file for 'rtl_433' pkgname=rtl_433 -version=23.11 +version=24.10 revision=1 build_style=cmake hostmakedepends="pkg-config libtool" @@ -11,11 +11,11 @@ license="GPL-2.0-or-later" homepage="https://github.com/merbanan/rtl_433" changelog="https://raw.githubusercontent.com/merbanan/rtl_433/master/CHANGELOG.md" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=1260c58400bf35832ac1b76cb3cccf3dc1335ffa2416909c63c7d7060c74663b +checksum=e5ab1597a723bf9e0eaa56be988b23dae3670471c6472510ba07b3b588407dcb post_install() { vmkdir usr/share/examples - mv ${DESTDIR}/usr/etc/rtl_433 ${DESTDIR}/usr/share/examples + mv ${DESTDIR}/etc/rtl_433 ${DESTDIR}/usr/share/examples } rtl_433-devel_package() { diff --git a/srcpkgs/ruby-hpricot/template b/srcpkgs/ruby-hpricot/template index 8188a78ab3a..1d00fc85ff2 100644 --- a/srcpkgs/ruby-hpricot/template +++ b/srcpkgs/ruby-hpricot/template @@ -7,7 +7,7 @@ makedepends="ruby-devel" short_desc="Swift, liberal HTML parser" maintainer="Orphaned " license="MIT" -homepage="http://code.whytheluckystiff.net/hpricot/" +homepage="https://github.com/hpricot/hpricot" distfiles="https://github.com/hpricot/hpricot/archive/${version}.tar.gz" checksum=792f63cebe2f2b02058974755b4c8a3aef52e5daf37f779a34885d5ff2876017 diff --git a/srcpkgs/ruby-tmuxinator/template b/srcpkgs/ruby-tmuxinator/template index cef033438fe..55b8442b85c 100644 --- a/srcpkgs/ruby-tmuxinator/template +++ b/srcpkgs/ruby-tmuxinator/template @@ -1,6 +1,6 @@ # Template file for 'ruby-tmuxinator' pkgname=ruby-tmuxinator -version=3.3.1 +version=3.3.2 revision=1 build_style=gemspec depends="ruby-erubi>=1.7 ruby-thor>=1.3.0 ruby-xdg>=4.3.0 tmux" @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/tmuxinator/tmuxinator" changelog="https://raw.githubusercontent.com/tmuxinator/tmuxinator/master/CHANGELOG.md" distfiles="https://github.com/tmuxinator/tmuxinator/archive/refs/tags/v${version}.tar.gz" -checksum=8b41f7c56b42ea13e37c99f4cd818a571859f473ae5acbed12f343a75e3fa1be +checksum=8b5a8cc899f48772f2a8bace06ff463c57248ad9575a668326f1e60b7e9616f0 post_install() { vlicense LICENSE diff --git a/srcpkgs/ruby-webrick/template b/srcpkgs/ruby-webrick/template index bc276f65bc7..9140b2636ce 100644 --- a/srcpkgs/ruby-webrick/template +++ b/srcpkgs/ruby-webrick/template @@ -1,6 +1,6 @@ # Template file for 'ruby-webrick' pkgname=ruby-webrick -version=1.8.2 +version=1.9.0 revision=1 build_style=gemspec hostmakedepends="ruby" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="https://rubygems.org/gems/webrick" distfiles="https://github.com/ruby/webrick/archive/refs/tags/v${version}.tar.gz" -checksum=a7edb8394f8c3bfd3e3eb44f95fb7513704576a45621310e3680a7758b481e67 +checksum=38c9352b9378c786f1c6904a355c541554b2367027a34d9fad6770a52aebff33 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 0a8fe1a5494..594375f5ba7 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -2,8 +2,8 @@ _ruby_abiver=3.3.0 pkgname=ruby -version=3.3.5 -revision=2 +version=3.3.6 +revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-rpath PKG_CONFIG=/usr/bin/pkg-config" @@ -12,11 +12,11 @@ hostmakedepends="pkg-config bison groff" makedepends="zlib-devel readline-devel libffi-devel openssl-devel gdbm-devel libyaml-devel pango-devel" short_desc="Ruby programming language" -homepage="http://www.ruby-lang.org/en/" +homepage="https://www.ruby-lang.org/en/" maintainer="Leah Neukirchen " license="Ruby, BSD-2-Clause" distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +checksum=540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" diff --git a/srcpkgs/ruff/template b/srcpkgs/ruff/template index a88f90b19b6..021bd57e5b2 100644 --- a/srcpkgs/ruff/template +++ b/srcpkgs/ruff/template @@ -1,6 +1,6 @@ # Template file for 'ruff' pkgname=ruff -version=0.6.8 +version=0.7.2 revision=1 build_style=python3-pep517 build_helper="rust qemu" @@ -12,7 +12,7 @@ license="MIT" homepage="https://docs.astral.sh/ruff/" changelog="https://raw.githubusercontent.com/astral-sh/ruff/main/CHANGELOG.md" distfiles="https://github.com/astral-sh/ruff/archive/refs/tags/${version}.tar.gz" -checksum=27765b3018646745b064ea5734a4f1ba36dede3df3883dd5d150e8307e5d2149 +checksum=e678307f10bd316f4bc8f0ca7419646e04be25b387f1ff84ea4470d482e240ba post_install() { vlicense LICENSE diff --git a/srcpkgs/ruplacer/template b/srcpkgs/ruplacer/template index c44813bcee6..0e47ef9a59a 100644 --- a/srcpkgs/ruplacer/template +++ b/srcpkgs/ruplacer/template @@ -1,6 +1,6 @@ # Template file for 'ruplacer' pkgname=ruplacer -version=0.9.0 +version=0.10.0 revision=1 build_style=cargo short_desc="Find and replace text in source files" @@ -9,7 +9,7 @@ license="BSD-3-Clause" homepage="https://github.com/your-tools/ruplacer" changelog="https://raw.githubusercontent.com/your-tools/ruplacer/main/CHANGELOG.md" distfiles="https://github.com/your-tools/ruplacer/archive/refs/tags/v${version}.tar.gz" -checksum=38467242bfa5c1932aa567664a26a01d52c7abc9b18c7d275c11427d11a4ffd6 +checksum=64570d46e9d3587903bc6d553da5f1581be9771a08672fd7a1b08e65ee0e008a post_install() { vlicense LICENSE diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template index 9c81eec5f34..0e708a915f9 100644 --- a/srcpkgs/rust-analyzer/template +++ b/srcpkgs/rust-analyzer/template @@ -1,6 +1,6 @@ # Template file for 'rust-analyzer' pkgname=rust-analyzer -version=2024.10.07 +version=2024.11.04 revision=1 _ver=${version//./-} build_style=cargo @@ -10,7 +10,7 @@ maintainer="icp " license="Apache-2.0, MIT" homepage="https://rust-analyzer.github.io/" distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz" -checksum=f46fb1c3bc4d6e7d328a123c0770c69a22b557d238aeec8d68175e0c3cd66bd1 +checksum=6b4a4be7ff0e54c1f839b1109bb33b6109a3f523eeeb0bfc89e7111da3d8a406 # tests require Rust source code make_check=no diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template index fd5213639a8..d0221f77c43 100644 --- a/srcpkgs/samplv1/template +++ b/srcpkgs/samplv1/template @@ -1,6 +1,6 @@ # Template file for 'samplv1' pkgname=samplv1 -version=1.1.2 +version=1.1.3 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-base" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://samplv1.sourceforge.io/" changelog="https://github.com/rncbc/samplv1/raw/main/ChangeLog" distfiles="${SOURCEFORGE_SITE}/samplv1/samplv1-${version}.tar.gz" -checksum=13972c5a0ff69c80e0b859070ecff75ba4623e7121d96fade5b41933fd442ede +checksum=93735b4053298865eb44a363d2c3b6c61e13376560d0f1fb45ff555f132a0b1b diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 10cec4dcb86..841bb0d90e0 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=2.4.9 +version=2.4.10 revision=1 # make sure the sbcl option in maxima is enabled for the same archs archs="i686 x86_64* armv7l aarch64 ppc64le*" @@ -16,7 +16,7 @@ license="custom:BSD+public_domain" homepage="http://www.sbcl.org/" changelog="http://www.sbcl.org/news.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=9970e4ebc5d6943dc64d7ca1f52d9b5cd9fc94cef94d233213d78ec75f3605e2 +checksum=ceeb396b69d2913eee04841c2af6beca5c342ce1464c3fe3e453f2de10c5e2f8 nocross=yes nopie=yes @@ -24,7 +24,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" baf57daeb23a79ee8d75f0db523f71c03ef13b250a0dc339a9fe4fd7f90631bb" + checksum+=" 99cc019120172bb4317f3c79cfc3afffe51e314091e07e8c0ba1d94759767777" ;; arm*) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2" diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index ba820209f0d..fef0d6fa9d8 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,6 +1,6 @@ # Template file for 'scite' pkgname=scite -version=5.5.2 +version=5.5.3 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://www.scintilla.org/SciTEDownload.html" distfiles="https://www.scintilla.org/scite${version//./}.tgz" -checksum=41f9eedc06e689d73cafa11cca4b696815163577344793ee01e3e5aa59e10674 +checksum=32d5f2f1ae0ccdd24ff117faa2d73e66ef8a7d84899e69977c14bc4550416ce6 post_extract() { sed -i '1i#include ' scite/src/StringList.h diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template index fc689098268..4d82ec02737 100644 --- a/srcpkgs/scons/template +++ b/srcpkgs/scons/template @@ -1,6 +1,6 @@ # Template file for 'scons' pkgname=scons -version=4.8.0 +version=4.8.1 revision=1 build_style="python3-module" make_install_args="--install-data=/usr/share/man/man1/" @@ -11,7 +11,7 @@ maintainer="Wilson Birney " license="MIT" homepage="https://www.scons.org/" distfiles="${SOURCEFORGE_SITE}/scons/${version}/SCons-${version}.tar.gz" -checksum=6e928fc97984e719814270f6863f2183b3b72180b0162a5ed09db68c9994100c +checksum=cad573b329b6a5bc7e654b01f0231064acc979026af68a9e467ddb32bf2ee501 make_check=no #SCons dist tarballs do not have tests, confirmed with SCons dev post_install() { diff --git a/srcpkgs/screen/patches/fix-musl.patch b/srcpkgs/screen/patches/fix-musl.patch new file mode 100644 index 00000000000..97617e9b2c6 --- /dev/null +++ b/srcpkgs/screen/patches/fix-musl.patch @@ -0,0 +1,10 @@ +--- a/utmp.c ++++ b/utmp.c +@@ -30,6 +30,7 @@ + + #include "utmp.h" + ++#include + #include + #include + #include diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template index 2f4bebecace..8618f369498 100644 --- a/srcpkgs/screen/template +++ b/srcpkgs/screen/template @@ -1,12 +1,9 @@ # Template file for 'screen' pkgname=screen version=5.0.0 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam - --enable-colors256 --enable-rxvt_osc --enable-telnet - --enable-use-locale --with-socket-dir=/run/screens --with-pty-group=5" -hostmakedepends="automake" +configure_args="--enable-telnet --enable-utmp --enable-socket-dir=/run/screens" makedepends="libutempter-devel ncurses-devel pam-devel" conf_files="/etc/screenrc /etc/skel/.screenrc" short_desc="GNU screen manager with VT100/ANSI terminal emulation" @@ -15,6 +12,7 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/s/screen/" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 +make_check=no # check is broken in 5.0.0 build_options="multiuser" @@ -22,10 +20,6 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" fi -pre_configure() { - ./autogen.sh -} - post_install() { vinstall etc/etcscreenrc 0644 etc screenrc vinstall etc/screenrc 0644 etc/skel .screenrc diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template index bc58a44504d..c48405e82cf 100644 --- a/srcpkgs/seatd/template +++ b/srcpkgs/seatd/template @@ -1,6 +1,6 @@ # Template file for 'seatd' pkgname=seatd -version=0.8.0 +version=0.9.1 revision=1 build_style=meson configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind) @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://sr.ht/~kennylevinsen/seatd/" distfiles="https://git.sr.ht/~kennylevinsen/seatd/archive/${version}.tar.gz" -checksum=a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0 +checksum=819979c922a0be258aed133d93920bce6a3d3565a60588d6d372ce9db2712cd3 system_groups=_seatd build_options="elogind" diff --git a/srcpkgs/sequoia-sop/template b/srcpkgs/sequoia-sop/template index 4c9c6e7c3ab..3977b8f65b3 100644 --- a/srcpkgs/sequoia-sop/template +++ b/srcpkgs/sequoia-sop/template @@ -1,24 +1,32 @@ # Template file for 'sequoia-sop' pkgname=sequoia-sop -version=0.35.0 +version=0.36.0 revision=1 build_style=cargo configure_args="--bin sqop --features cli,sequoia-openpgp/compression" hostmakedepends="pkg-config llvm clang" -makedepends="nettle-devel bzip2-devel" +makedepends="nettle-devel bzip2-devel sqlite-devel" short_desc="Implementation of the Stateless OpenPGP CLI using Sequoia" maintainer="classabbyamp " license="GPL-2.0-or-later" homepage="https://gitlab.com/sequoia-pgp/sequoia-sop/" distfiles="https://gitlab.com/sequoia-pgp/sequoia-sop/-/archive/v${version}/sequoia-sop-v${version}.tar.gz" -checksum=2aa20ff9143ddc4c53b0e9ec377ac230778df099740284080be88841a1a13ee7 +checksum=3f56d57fb19941f3a9202693f2ed285d47572f593aca9aca43ac83b1791aa891 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" $makedepends" +fi + +case "$XBPS_TARGET_MACHINE" in + armv*l) nocross="Requires C libs included in build.rs, which is currently broken in xbps-src. These failures only manifest on a hf archs right now";; +esac pre_build() { export ASSET_OUT_DIR=assets } post_install() { - for page in man-sqop/*; do + for page in assets/man-pages/*; do vman ${page} done vcompletion assets/shell-completions/_sqop zsh diff --git a/srcpkgs/sequoia-sq/template b/srcpkgs/sequoia-sq/template index f43bf5c0ce9..3e46dbb69d3 100644 --- a/srcpkgs/sequoia-sq/template +++ b/srcpkgs/sequoia-sq/template @@ -1,6 +1,6 @@ # Template file for 'sequoia-sq' pkgname=sequoia-sq -version=0.38.0 +version=0.39.0 revision=1 build_style=cargo build_helper=qemu @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://sequoia-pgp.org/projects/#sq" changelog="https://gitlab.com/sequoia-pgp/sequoia-sq/-/raw/main/NEWS" distfiles="https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${version}/sequoia-sq-v${version}.tar.gz" -checksum=9fd32ad0de3388804e21205003821710d2faf99d5c85a50bd97da3e7e480921b +checksum=ee63c606adbfedeb32fbeacb522eac0f6a0a7358710da21fc602b2f8f74f7726 conflicts="squirrel" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch b/srcpkgs/shaderc/patches/fix-glslang-link-order.patch deleted file mode 100644 index 99292c74483..00000000000 --- a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/google/shaderc/pull/463 ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) - endif(SHADERC_ENABLE_WGSL_OUTPUT) - - target_link_libraries(glslc PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries -+ glslang OSDependent OGLCompiler glslang SPIRV HLSL # Glslang libraries - $<$:libtint> # Tint libraries, optional - shaderc_util shaderc # internal Shaderc libraries - ${CMAKE_THREAD_LIBS_INIT}) ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL) - - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) -+ glslang OSDependent OGLCompiler glslang HLSL SPIRV -+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( - TEST_PREFIX shaderc_util diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template index 1ab7478262a..d7dae4f902b 100644 --- a/srcpkgs/shaderc/template +++ b/srcpkgs/shaderc/template @@ -1,6 +1,6 @@ # Template file for 'shaderc' pkgname=shaderc -version=2022.2 +version=2024.3 revision=1 build_style=cmake configure_args="-DSHADERC_SKIP_TESTS=ON" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/google/shaderc" distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz" -checksum=517d36937c406858164673db696dc1d9c7be7ef0960fbf2965bfef768f46b8c0 +checksum=d5c68b5de5d4c7859d9699054493e0a42a2a5eb21b425d63f7b7dd543db0d708 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang" LDFLAGS="-Wl,--no-undefined" diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template index 62d1dee965c..bf64cf1eb13 100644 --- a/srcpkgs/shfmt/template +++ b/srcpkgs/shfmt/template @@ -1,19 +1,19 @@ # Template file for 'shfmt' pkgname=shfmt -version=3.9.0 -revision=2 +version=3.10.0 +revision=1 build_style=go go_import_path=mvdan.cc/sh/v3 go_package="${go_import_path}/cmd/shfmt" go_ldflags="-X main.version=${version}" hostmakedepends="scdoc" short_desc="Shell parser and formatter" -maintainer="Daniel Lewan " +maintainer="Daniel Lewan " license="BSD-3-Clause" homepage="https://github.com/mvdan/sh" changelog="https://raw.githubusercontent.com/mvdan/sh/master/CHANGELOG.md" distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz" -checksum=d8bd0b83cd41bb65420395d6efb7d2c4bfcd535fbf3d702325d150e5ee2d1809 +checksum=4cad722b7a569a05c86ec489b1d5980843ae60ca8db15aa71174c7810378a8ec post_install() { scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 diff --git a/srcpkgs/shortwave/patches/no-git.patch b/srcpkgs/shortwave/patches/no-git.patch deleted file mode 100644 index 43f197af970..00000000000 --- a/srcpkgs/shortwave/patches/no-git.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru a/meson.build b/meson.build ---- a/meson.build 2023-02-07 02:12:17.000000000 +0300 -+++ b/meson.build 2023-04-27 23:57:14.057890647 +0300 -@@ -31,7 +31,7 @@ - base_id = 'de.haeckerfelix.Shortwave' - path_id = '/de/haeckerfelix/Shortwave' - app_id = base_id --vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip() -+vcs_tag = 'none' - profile = get_option('profile') - datadir = join_paths(get_option('prefix'), get_option('datadir')) - localedir = join_paths(get_option('prefix'), get_option('localedir')) diff --git a/srcpkgs/shortwave/template b/srcpkgs/shortwave/template index 0fb0d706556..0147b612555 100644 --- a/srcpkgs/shortwave/template +++ b/srcpkgs/shortwave/template @@ -1,23 +1,27 @@ # Template file for 'shortwave' pkgname=shortwave -version=3.2.0 -revision=2 +version=4.0.1 +revision=1 build_style=meson build_helper=rust -hostmakedepends="pkg-config cargo gettext desktop-file-utils glib-devel - gtk-update-icon-cache" -makedepends="libadwaita-devel libshumate-devel rust-std" +hostmakedepends="cargo desktop-file-utils gettext glib-devel + gtk4-update-icon-cache pkg-config" +makedepends="lcms-devel libadwaita-devel libseccomp-devel libshumate-devel + rust-std" depends="gst-plugins-good1" short_desc="Listen to internet radio" maintainer="chrysos349 " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/Shortwave" distfiles="https://gitlab.gnome.org/World/Shortwave/-/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=b1d5272d41bf6dd2d7b578e3c352a0f3ca3e502cd3ec0c28ba8153c8887d08b9 +checksum=2233ccb845be1b104dbf637ef1db99b2a2f29a51270b47d0894c03048ac0637c post_patch() { + # remove git dep + ln -sf /bin/false ${XBPS_WRAPPERDIR}/git + if [ "$CROSS_BUILD" ]; then vsed -i src/meson.build \ - -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%" + -e "s%rust_target /%'${RUST_TARGET}' / &%" fi } diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template deleted file mode 100644 index 3d65fd23905..00000000000 --- a/srcpkgs/skype/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'skype' -# This just repackages the rpm package. -pkgname=skype -version=8.108.0.205 -revision=1 -archs="x86_64" -create_wrksrc=yes -depends="elogind" -short_desc="Skype for Linux" -maintainer="mobinmob " -license="custom:skype-servicesagreement" # no vlicense -homepage="https://www.skype.com" -distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm" -checksum=be3b714636da765e40b4c814a32988914938e2788b0ad558bfb9b7ce1e67dcef -repository="nonfree" -nostrip="yes" - -do_install() { - # Copy files - vcopy "*" "." - # Move executables to usr/lib and change the launcher script - vsed -i "${DESTDIR}/usr/bin/skypeforlinux" -e "s;share/;lib/;g" - vmkdir usr/lib/skypeforlinux - mv "${DESTDIR}/usr/share/skypeforlinux" "${DESTDIR}/usr/lib/" - # Install NOTICE.txt as license. Skype has only a services - # agreement available online. - vlicense "${DESTDIR}/usr/share/doc/skypeforlinux/NOTICE.txt" - # Remove unneeded dir. - rm -rf "${DESTDIR}/usr/lib/.build-id" -} diff --git a/srcpkgs/skype/update b/srcpkgs/skype/update deleted file mode 100644 index 40deabe2f5d..00000000000 --- a/srcpkgs/skype/update +++ /dev/null @@ -1,2 +0,0 @@ -ignore="*.76.*" -pattern="skypeforlinux_\K[\d.]+(?=_amd64.deb)" diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template index 49bd57e1559..54a71c2a683 100644 --- a/srcpkgs/slack-desktop/template +++ b/srcpkgs/slack-desktop/template @@ -1,6 +1,6 @@ # Template file for 'slack-desktop' pkgname=slack-desktop -version=4.40.133 +version=4.41.97 revision=1 archs="x86_64" depends="xdg-utils" @@ -10,7 +10,7 @@ license="custom:Proprietary" homepage="https://slack.com/" changelog="https://slack.com/release-notes/linux" distfiles="https://downloads.slack-edge.com/desktop-releases/linux/x64/${version}/${pkgname}-${version}-amd64.deb" -checksum=8212abcc820473c8d57124d5a1b585321bf2ffae02473156bd7a0e5c1b72838f +checksum=6d783da80f7297088abaa011f442e39ce5290279172baaface1ca8962213ca95 restricted=yes repository="nonfree" nopie=yes diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch index f39d90ec944..fa083c2f066 100644 --- a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch +++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch @@ -1,15 +1,13 @@ -diff --git testsuite/Makefile.am testsuite/Makefile.am -index ccb84d3..9774a9c 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \ -- equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test \ +- equal-date.test cmp-lt.test humanstring.test uuid.test \ - table.test table-formatter.test csv-formatter.test json-formatter.test \ - getopts.test scan-datetime.test root-prefix.test range.test limit.test -+ equal-date.test dbus-escape.test uuid.test \ ++ equal-date.test uuid.test \ + csv-formatter.test json-formatter.test \ + getopts.test scan-datetime.test root-prefix.test diff --git a/srcpkgs/snapper/patches/fix-missing-include-musl.patch b/srcpkgs/snapper/patches/fix-missing-include-musl.patch new file mode 100644 index 00000000000..3d613e71db8 --- /dev/null +++ b/srcpkgs/snapper/patches/fix-missing-include-musl.patch @@ -0,0 +1,27 @@ +From d103eaeae169708ca567f092182a89b79e5ab9db Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Oct 2024 07:52:33 -0700 +Subject: [PATCH] Include linux/types.h for __u16/__u32/__u64 type + +This header is included indirectly with glibc but when using musl +it ends up with compilation failure + +BcachefsUtils.cc:85:20: error: use of undeclared identifier '__u32' + 85 | args.dirfd = (__u32) fddst; + | ^ +--- + snapper/BcachefsUtils.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc +index e9163ffb..1d328a78 100644 +--- a/snapper/BcachefsUtils.cc ++++ b/snapper/BcachefsUtils.cc +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 2f9e7a22f81..1aabb8fa838 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper -version=0.10.3 -revision=4 +version=0.11.2 +revision=1 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" conf_files="/etc/conf.d/snapper" @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" -checksum=adc207cc049d3b2302201d3bc8ad4c49dd9cf61192273e0bca118d35c3e940cc +checksum=d2a33935f94f30b22aecbdfdecccf651b3616fa698aec266646a9d06043bfd6f lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = musl ] @@ -30,7 +30,7 @@ pre_configure() { # rename cron scripts sed -i -e 's@suse.de-@@g' scripts/Makefile.am # fix config location in cron scripts - sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-{daily,hourly} + sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-hourly # fix pam plugin install location sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template index d45f42c3470..a2ce5006286 100644 --- a/srcpkgs/sops/template +++ b/srcpkgs/sops/template @@ -1,7 +1,7 @@ # Template file for 'sops' pkgname=sops -version=3.9.0 -revision=2 +version=3.9.1 +revision=1 build_style=go go_import_path="github.com/getsops/sops/v3" go_package="${go_import_path}/cmd/sops" @@ -11,4 +11,5 @@ license="MPL-2.0" homepage="https://github.com/getsops/sops" changelog="https://raw.githubusercontent.com/getsops/sops/main/CHANGELOG.rst" distfiles="https://github.com/getsops/sops/archive/refs/tags/v${version}.tar.gz" -checksum=eda01428a4178903b2d9552940fe441d93fab7b4582cd3f5fee7b6b73404d8cb +checksum=d79e8caaef3134d00f759231e8ef587b791996e2e45319ffe83dee1ab01aebda +make_check=no # tests require a running docker daemon diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index d8e62aef897..d2fdddb7f35 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -1,8 +1,8 @@ # Template file for 'spotify' pkgname=spotify -version=1.2.47 -revision=2 -_subver=364.gf06e5cee +version=1.2.48 +revision=1 +_subver=405.gf2c48e6f archs="x86_64" create_wrksrc=yes hostmakedepends="libcurl" @@ -12,7 +12,7 @@ maintainer="Stefan Mühlinghaus " license="custom:Proprietary" homepage="https://www.spotify.com" distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.${_subver}_amd64.deb" -checksum=65405a1346884600e5a1a350bc0bcfb17f822432031d45ae11c3eeea3236c8fa +checksum=9c0e845624e3e5b528d5ffe07888892502555261446e3f747908cc355dff0752 repository=nonfree restricted=yes nostrip=yes diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template index b35cb7ab96a..1b36e931580 100644 --- a/srcpkgs/sqlcipher/template +++ b/srcpkgs/sqlcipher/template @@ -1,7 +1,7 @@ # Template file for 'sqlcipher' pkgname=sqlcipher -version=4.3.0 -revision=4 +version=4.6.1 +revision=1 build_style=gnu-configure configure_args="--enable-tempstore=yes" hostmakedepends="tcl" @@ -12,12 +12,12 @@ license="BSD-3-Clause" homepage="https://www.zetetic.net/sqlcipher/" changelog="https://raw.githubusercontent.com/sqlcipher/sqlcipher/v${version}/CHANGELOG.md" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f +checksum=d8f9afcbc2f4b55e316ca4ada4425daf3d0b4aab25f45e11a802ae422b9f53a3 CFLAGS="-DSQLITE_HAS_CODEC" post_install() { - vlicense LICENSE + vlicense LICENSE.md } sqlcipher-devel_package() { diff --git a/srcpkgs/sqlitebrowser/template b/srcpkgs/sqlitebrowser/template index 309bbfc7cb9..7fdca27efe8 100644 --- a/srcpkgs/sqlitebrowser/template +++ b/srcpkgs/sqlitebrowser/template @@ -1,6 +1,6 @@ # Template file for 'sqlitebrowser' pkgname=sqlitebrowser -version=3.12.2 +version=3.13.1 revision=1 build_style=cmake configure_args="-DUSE_QT5=1" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="MPL-2.0, GPL-3.0-or-later" homepage="http://sqlitebrowser.org/" distfiles="https://github.com/sqlitebrowser/sqlitebrowser/archive/v${version}.tar.gz" -checksum=645f98d38e5d128a449e93cebf03c8070f9eacd2d16b10e433a781d54a9d478a +checksum=1044ba67d649cabc459eb887c016f70d6a404ad651390ab33bf7859dc7f1b67b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel qt5-tools-devel" diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template index 3e7cacb1dc5..3d40bbd149f 100644 --- a/srcpkgs/sqlmap/template +++ b/srcpkgs/sqlmap/template @@ -1,6 +1,6 @@ # Template file for 'sqlmap' pkgname=sqlmap -version=1.8.9 +version=1.8.11 revision=1 pycompile_dirs="usr/libexec/sqlmap" depends="python3" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="http://sqlmap.org" distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz" -checksum=3ae9969bec583d21790c5282aa3e586bf8fa822ad5d267afb7ea19db07ac434c +checksum=e52ee3a3c1892745176f936fc16a7f761d690739afa4b7b01c64e9144849cbd9 python_version=3 do_install() { diff --git a/srcpkgs/srt/template b/srcpkgs/srt/template index 0856c4f86d2..0543f2f604a 100644 --- a/srcpkgs/srt/template +++ b/srcpkgs/srt/template @@ -1,6 +1,6 @@ # Template file for 'srt' pkgname=srt -version=1.5.3 +version=1.5.4 revision=1 build_style=cmake configure_args=" @@ -14,7 +14,7 @@ license="MPL-2.0" homepage="https://github.com/Haivision/srt" changelog="https://github.com/Haivision/srt/releases" distfiles="https://github.com/Haivision/srt/archive/refs/tags/v${version}.tar.gz" -checksum=befaeb16f628c46387b898df02bc6fba84868e86a6f6d8294755375b9932d777 +checksum=d0a8b600fe1b4eaaf6277530e3cfc8f15b8ce4035f16af4a5eb5d4b123640cdd libsrt_package() { depends="libsrt>=${version}_${revision}" diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template index 3b4f999f44a..dcf8eff348d 100644 --- a/srcpkgs/starship/template +++ b/srcpkgs/starship/template @@ -1,6 +1,6 @@ # Template file for 'starship' pkgname=starship -version=1.20.1 +version=1.21.1 revision=1 build_style=cargo build_helper=qemu @@ -14,7 +14,7 @@ license="ISC" homepage="https://starship.rs" changelog="https://raw.githubusercontent.com/starship/starship/master/CHANGELOG.md" distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz" -checksum=851d84be69f9171f10890e3b58b8c5ec6057dd873dc83bfe0bdf965f9844b5dc +checksum=f543dfa3229441ca2a55b8a625ce4bad5756a896378b019f4d0f0e00cf34dcc8 make_check_pre="env HOME=${wrksrc}/fake-home" pre_check() { diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch deleted file mode 100644 index 5b260226d73..00000000000 --- a/srcpkgs/streamlink/patches/streamlink.patch +++ /dev/null @@ -1,102 +0,0 @@ -exceptiongroup is for python<3.11 compat - ---- a/src/streamlink.egg-info/requires.txt -+++ b/src/streamlink.egg-info/requires.txt -@@ -1,5 +1,4 @@ - certifi --exceptiongroup - isodate - lxml<6,>=4.6.4 - pycountry ---- a/src/streamlink.egg-info/PKG-INFO -+++ b/src/streamlink.egg-info/PKG-INFO -@@ -32,7 +32,6 @@ - Description-Content-Type: text/markdown - License-File: LICENSE - Requires-Dist: certifi --Requires-Dist: exceptiongroup - Requires-Dist: isodate - Requires-Dist: lxml<6,>=4.6.4 - Requires-Dist: pycountry ---- a/PKG-INFO -+++ b/PKG-INFO -@@ -32,7 +32,6 @@ - Description-Content-Type: text/markdown - License-File: LICENSE - Requires-Dist: certifi --Requires-Dist: exceptiongroup - Requires-Dist: isodate - Requires-Dist: lxml<6,>=4.6.4 - Requires-Dist: pycountry ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -56,7 +56,6 @@ - requires-python = ">=3.8" - dependencies = [ - "certifi", -- "exceptiongroup", - "isodate", - "lxml >=4.6.4,<6", - "pycountry", ---- a/src/streamlink/plugins/twitch.py -+++ b/src/streamlink/plugins/twitch.py -@@ -541,7 +541,6 @@ - headers: Mapping[str, str], - device_id: str, - ) -> Optional[Tuple[str, int]]: -- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001 - from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415 - - url = f"https://www.twitch.tv/{channel}" ---- a/src/streamlink/webbrowser/webbrowser.py -+++ b/src/streamlink/webbrowser/webbrowser.py -@@ -8,7 +8,6 @@ - from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union - - import trio --from exceptiongroup import BaseExceptionGroup - - from streamlink.utils.path import resolve_executable - from streamlink.webbrowser.exceptions import WebbrowserError ---- a/src/streamlink/compat.py -+++ b/src/streamlink/compat.py -@@ -5,9 +5,6 @@ - import warnings - from typing import Any, Callable, Dict, Optional, Tuple - --# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311 --import exceptiongroup # noqa: F401 -- - from streamlink.exceptions import StreamlinkDeprecationWarning - - ---- a/tests/webbrowser/test_webbrowser.py -+++ b/tests/webbrowser/test_webbrowser.py -@@ -7,7 +7,6 @@ - - import pytest - import trio --from exceptiongroup import BaseExceptionGroup - - from streamlink.compat import is_win32 - from streamlink.webbrowser.exceptions import WebbrowserError ---- a/tests/webbrowser/cdp/test_connection.py -+++ b/tests/webbrowser/cdp/test_connection.py -@@ -7,7 +7,6 @@ - - import pytest - import trio --from exceptiongroup import ExceptionGroup - from trio.testing import MockClock, wait_all_tasks_blocked - from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import] - ---- a/tests/webbrowser/cdp/test_client.py -+++ b/tests/webbrowser/cdp/test_client.py -@@ -4,7 +4,6 @@ - - import pytest - import trio --from exceptiongroup import ExceptionGroup - from trio.testing import wait_all_tasks_blocked - - from streamlink.session import Streamlink diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template index 18006c720eb..757a76a6693 100644 --- a/srcpkgs/streamlink/template +++ b/srcpkgs/streamlink/template @@ -1,23 +1,21 @@ # Template file for 'streamlink' pkgname=streamlink -version=6.7.3 +version=7.0.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel python3-versioningit" depends="python3-lxml python3-pycryptodome python3-pycountry python3-pysocks python3-requests python3-websocket-client python3-isodate python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket" -checkdepends="$depends python3-pytest python3-mock python3-requests-mock - python3-freezegun python3-pytest-asyncio" +checkdepends="$depends python3-pytest python3-requests-mock python3-pytest-trio python3-freezegun" short_desc="Utility extracting streams from services, forked from livestreamer" maintainer="Tom Strausbaugh " license="BSD-2-Clause" homepage="https://streamlink.github.io/" changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md" distfiles="https://github.com/streamlink/streamlink/releases/download/$version/streamlink-$version.tar.gz" -checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c +checksum=51a4062862e6795d694046ca6e70549d6d13583c640d1505966804b0e03feff2 make_check_pre="env PYTHONPATH=src" -make_check=ci-skip # some tests fail when running as root post_install() { vlicense LICENSE diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index f3260bfab91..c391847b12a 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -1,6 +1,6 @@ # Template file for 'stress-ng' pkgname=stress-ng -version=0.18.05 +version=0.18.06 revision=1 build_style=gnu-makefile make_use_env=1 @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/ColinIanKing/stress-ng/" distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz" -checksum=b0ac75b68bb804fd3276fcb235f1b0a9567090ebd887b2ed0f8a3203f9545e11 +checksum=f3197c010b1ac23b015a6f8e8c84a24cee02750bf41a1527379ccb31ca4f889a if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template index c5fcc24a1b2..1f67a4d44f0 100644 --- a/srcpkgs/subfinder/template +++ b/srcpkgs/subfinder/template @@ -1,7 +1,7 @@ # Template file for 'subfinder' pkgname=subfinder -version=2.6.6 -revision=2 +version=2.6.7 +revision=1 build_wrksrc=v2 build_style=go go_import_path="github.com/projectdiscovery/subfinder/v2" @@ -12,7 +12,8 @@ license="MIT" homepage="https://github.com/projectdiscovery/subfinder" changelog="https://github.com/projectdiscovery/subfinder/releases" distfiles="https://github.com/projectdiscovery/subfinder/archive/refs/tags/v${version}.tar.gz" -checksum=636bccb8b5a18b709f735f29979e53752f3d71e1c246b7ce845d802766937bf2 +checksum=3ce0d4ddcca869d459a2571a2c1b437456007109e5d6ebfc4d3fdcea6a6edca7 +make_check=no # network tests get blocked by cloudflare post_install() { vlicense ../LICENSE.md diff --git a/srcpkgs/supertuxkart/patches/fix-crash.patch b/srcpkgs/supertuxkart/patches/fix-crash.patch new file mode 100644 index 00000000000..5d5afd43ad0 --- /dev/null +++ b/srcpkgs/supertuxkart/patches/fix-crash.patch @@ -0,0 +1,36 @@ +From 8544f19b59208ae93fc3db0cf41bd386c6aefbcb Mon Sep 17 00:00:00 2001 +From: Benau +Date: Thu, 5 Jan 2023 10:33:39 +0800 +Subject: [PATCH] Fix #4834 + +--- + src/race/race_manager.hpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp +index 67a6ebd5016..63c39f0f677 100644 +--- a/src/race/race_manager.hpp ++++ b/src/race/race_manager.hpp +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + + #include "network/remote_kart_info.hpp" +@@ -644,11 +645,14 @@ class RaceManager + // ---------------------------------------------------------------------------------------- + int getKartLocalPlayerId(int k) const + { ++ assert(k < (int)m_kart_status.size()); + return m_kart_status[k].m_local_player_id; + } // getKartLocalPlayerId + // ---------------------------------------------------------------------------------------- + int getKartGlobalPlayerId(int k) const + { ++ if (k >= (int)m_kart_status.size()) ++ return -1; + return m_kart_status[k].m_global_player_id; + } // getKartGlobalPlayerId + // ---------------------------------------------------------------------------------------- diff --git a/srcpkgs/supertuxkart/patches/fix-missing-rotation.patch b/srcpkgs/supertuxkart/patches/fix-missing-rotation.patch new file mode 100644 index 00000000000..c240ac58a9d --- /dev/null +++ b/srcpkgs/supertuxkart/patches/fix-missing-rotation.patch @@ -0,0 +1,27 @@ +From 0c2b81ac1f9ff29f5012a98f530880b87f416337 Mon Sep 17 00:00:00 2001 +From: Benau +Date: Thu, 3 Nov 2022 11:39:25 +0800 +Subject: [PATCH] Fix missing rotation when lto is used, see #4811 + +--- + src/physics/physical_object.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp +index c389b7a28b2..09d57034ece 100644 +--- a/src/physics/physical_object.cpp ++++ b/src/physics/physical_object.cpp +@@ -637,10 +637,12 @@ void PhysicalObject::updateGraphics(float dt) + + Vec3 hpr; + hpr.setHPR(SmoothNetworkBody::getSmoothedTrans().getRotation()); ++ // Fix missing rotation when lto is used, see #4811 ++ hpr *= RAD_TO_DEGREE; + + // This will only update the visual position, so it can be + // called in updateGraphics() +- m_object->move(xyz.toIrrVector(), hpr.toIrrVector()*RAD_TO_DEGREE, ++ m_object->move(xyz.toIrrVector(), hpr.toIrrVector(), + m_init_scale, /*updateRigidBody*/false, + /* isAbsoluteCoord */true); + } // updateGraphics diff --git a/srcpkgs/supertuxkart/patches/gcc13-fix-1.patch b/srcpkgs/supertuxkart/patches/gcc13-fix-1.patch new file mode 100644 index 00000000000..789934d3f63 --- /dev/null +++ b/srcpkgs/supertuxkart/patches/gcc13-fix-1.patch @@ -0,0 +1,72 @@ +From 27eb0f3116921492e183ad3aa685ddb147ed7183 Mon Sep 17 00:00:00 2001 +From: Gwyn Ciesla +Date: Thu, 23 Feb 2023 08:56:27 -0600 +Subject: [PATCH] gcc13 fixes + +--- + lib/graphics_engine/include/vk_mem_alloc.h | 2 ++ + lib/graphics_engine/src/ge_vulkan_command_loader.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_depth_texture.cpp | 2 ++ + lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp | 1 + + 5 files changed, 7 insertions(+) + +diff --git a/lib/graphics_engine/include/vk_mem_alloc.h b/lib/graphics_engine/include/vk_mem_alloc.h +index d4b683a7551..ac82aedb15b 100644 +--- a/lib/graphics_engine/include/vk_mem_alloc.h ++++ b/lib/graphics_engine/include/vk_mem_alloc.h +@@ -20,6 +20,8 @@ + // THE SOFTWARE. + // + ++#include ++ + #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H + #define AMD_VULKAN_MEMORY_ALLOCATOR_H + +diff --git a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp +index a1e5b3a71b8..13cadd63daf 100644 +--- a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include "../source/Irrlicht/os.h" + +diff --git a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp +index 4a5d3d391b1..0411c617df6 100644 +--- a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp +@@ -1,3 +1,5 @@ ++#include ++ + #include "ge_vulkan_depth_texture.hpp" + + #include "ge_main.hpp" +diff --git a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp +index f510f91813a..a821ee4a962 100644 +--- a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + namespace GE + { +diff --git a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp +index fe7fcc45515..82977f00785 100644 +--- a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + namespace GE + { diff --git a/srcpkgs/supertuxkart/patches/gcc13-fix-2.patch b/srcpkgs/supertuxkart/patches/gcc13-fix-2.patch new file mode 100644 index 00000000000..21fad1ae65a --- /dev/null +++ b/srcpkgs/supertuxkart/patches/gcc13-fix-2.patch @@ -0,0 +1,155 @@ +From 0163e3fa88b72634c3ddff5304c9086b649f53b1 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 26 Jan 2023 16:35:54 +0100 +Subject: [PATCH] Add missing includes to fix the build with gcc 13 + +Like other versions before, gcc 13 moved some includes around and as a +result and are no longer transitively included. +Explicitly include them for std::runtime_error and snprintf. +--- + lib/graphics_engine/include/vk_mem_alloc.h | 1 + + lib/graphics_engine/src/ge_spm_buffer.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_array_texture.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_command_loader.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_depth_texture.cpp | 2 ++ + lib/graphics_engine/src/ge_vulkan_draw_call.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_texture.cpp | 1 + + lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp | 1 + + 11 files changed, 12 insertions(+) + +diff --git a/lib/graphics_engine/include/vk_mem_alloc.h b/lib/graphics_engine/include/vk_mem_alloc.h +index bdb4ff57610..d4b683a7551 100644 +--- a/lib/graphics_engine/include/vk_mem_alloc.h ++++ b/lib/graphics_engine/include/vk_mem_alloc.h +@@ -2563,6 +2563,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( + #undef VMA_IMPLEMENTATION + + #include ++#include + #include + #include + #include +diff --git a/lib/graphics_engine/src/ge_spm_buffer.cpp b/lib/graphics_engine/src/ge_spm_buffer.cpp +index fe4f4758adf..1179a732566 100644 +--- a/lib/graphics_engine/src/ge_spm_buffer.cpp ++++ b/lib/graphics_engine/src/ge_spm_buffer.cpp +@@ -5,6 +5,7 @@ + #include "ge_vulkan_features.hpp" + + #include ++#include + + #include "mini_glm.hpp" + +diff --git a/lib/graphics_engine/src/ge_vulkan_array_texture.cpp b/lib/graphics_engine/src/ge_vulkan_array_texture.cpp +index f3361478c3b..0f817dc40fd 100644 +--- a/lib/graphics_engine/src/ge_vulkan_array_texture.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_array_texture.cpp +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + namespace GE + { +diff --git a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp +index 358cf9ab6ec..a1e5b3a71b8 100644 +--- a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + + #include "../source/Irrlicht/os.h" +diff --git a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp +index 25cb2429638..4a5d3d391b1 100644 +--- a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp +@@ -3,6 +3,8 @@ + #include "ge_main.hpp" + #include "ge_vulkan_driver.hpp" + ++#include ++ + namespace GE + { + GEVulkanDepthTexture::GEVulkanDepthTexture(GEVulkanDriver* vk, +diff --git a/lib/graphics_engine/src/ge_vulkan_draw_call.cpp b/lib/graphics_engine/src/ge_vulkan_draw_call.cpp +index 2c2bc57513f..c8a1ddffb5e 100644 +--- a/lib/graphics_engine/src/ge_vulkan_draw_call.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_draw_call.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "../source/Irrlicht/os.h" + #include "quaternion.h" +diff --git a/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp b/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp +index 9413a04bb00..834a0b43b1e 100644 +--- a/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + namespace GE + { +diff --git a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp +index 380f348dffb..f510f91813a 100644 +--- a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp +@@ -10,6 +10,7 @@ + + #include + #include ++#include + #include + + namespace GE +diff --git a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp +index 2543b16086f..fe7fcc45515 100644 +--- a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp +@@ -11,6 +11,7 @@ + + #include + #include ++#include + #include + + namespace GE +diff --git a/lib/graphics_engine/src/ge_vulkan_texture.cpp b/lib/graphics_engine/src/ge_vulkan_texture.cpp +index 500eb65fc62..611a24171d4 100644 +--- a/lib/graphics_engine/src/ge_vulkan_texture.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_texture.cpp +@@ -21,6 +21,7 @@ extern "C" + #include + #include + #include ++#include + + namespace GE + { +diff --git a/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp b/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp +index 4fd8a2e8800..c64d1bdbaa1 100644 +--- a/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp ++++ b/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + namespace GE + { diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template index 0bd25b7cfc9..c563cdb2ecf 100644 --- a/srcpkgs/supertuxkart/template +++ b/srcpkgs/supertuxkart/template @@ -1,7 +1,7 @@ # Template file for 'supertuxkart' pkgname=supertuxkart version=1.4 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index d330f02c3cc..c69d3b24c4a 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,12 +1,12 @@ # Template file for 'sway' pkgname=sway -version=1.9 +version=1.10 revision=1 build_style=meson configure_args="-Dwerror=false -Db_ndebug=false" conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots0.17-devel pcre2-devel json-c-devel pango-devel cairo-devel +makedepends="wlroots0.18-devel pcre2-devel json-c-devel pango-devel cairo-devel gdk-pixbuf-devel libevdev-devel" depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1" short_desc="Tiling Wayland compositor compatible with i3" @@ -15,7 +15,7 @@ license="MIT" homepage="https://swaywm.org" changelog="https://github.com/swaywm/sway/releases" distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz" -checksum=b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b +checksum=3f15f8f96238d2f7a7b44dbcd132de6c81b2c06cc3b073f195f07f7105072ccf post_install() { vlicense LICENSE diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template index bff7bace80e..3bbbc775e5f 100644 --- a/srcpkgs/swayimg/template +++ b/srcpkgs/swayimg/template @@ -1,6 +1,6 @@ # Template file for 'swayimg' pkgname=swayimg -version=3.3 +version=3.4 revision=1 build_style=meson configure_args="-D version=${version}" @@ -14,7 +14,7 @@ maintainer="voidbert " license="MIT" homepage="https://github.com/artemsen/swayimg" distfiles="https://github.com/artemsen/swayimg/archive/v${version}.tar.gz" -checksum=1453aca5dba7c05057b58dee26b454eb3319fa3f9ac31047afd3ab1effc2a0a9 +checksum=22c3379fb3eab5f6c2df538b4413b5e8a445ae11aba4e81edfe66f32922d0d8e post_install() { vcompletion extra/bash.completion bash diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template index 0212a1fab53..38d3d22de17 100644 --- a/srcpkgs/swaylock/template +++ b/srcpkgs/swaylock/template @@ -1,6 +1,6 @@ # Template file for 'swaylock' pkgname=swaylock -version=1.7.2 +version=1.8.0 revision=1 build_style=meson conf_files="/etc/pam.d/swaylock" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/swaywm/swaylock" changelog="https://github.com/swaywm/swaylock/releases" distfiles="https://github.com/swaywm/swaylock/releases/download/v${version}/swaylock-${version}.tar.gz" -checksum=bf965d47fb6fc1402f854d4679d21a9459713fc0f330bc607c9585db097b4304 +checksum=6a1175442380b87b2d2868c4a5366ee3592163158d02e3a7fbf3a0bfe07d8b00 post_install() { vlicense LICENSE diff --git a/srcpkgs/swayr/update b/srcpkgs/swayr/update new file mode 100644 index 00000000000..6ca64b471c2 --- /dev/null +++ b/srcpkgs/swayr/update @@ -0,0 +1 @@ +pattern='Release swayr-\K[\d.]+(?=)' diff --git a/srcpkgs/swayrbar/template b/srcpkgs/swayrbar/template index 4571ff0ba77..8eeec014d3f 100644 --- a/srcpkgs/swayrbar/template +++ b/srcpkgs/swayrbar/template @@ -1,6 +1,6 @@ # Template file for 'swayrbar' pkgname=swayrbar -version=0.4.0 +version=0.4.2 revision=1 build_wrksrc=swayrbar build_style=cargo @@ -11,4 +11,4 @@ license="GPL-3.0-or-later" homepage="https://sr.ht/~tsdh/swayr/" changelog="https://git.sr.ht/~tsdh/swayr/tree/main/item/swayr/NEWS.md" distfiles="https://git.sr.ht/~tsdh/swayr/archive/swayrbar-${version}.tar.gz" -checksum=8611f62325561b9506fb05bcb4087f3face991cc1f9e7cef5de8f08b57b29cd6 +checksum=6a7b3b0bbb57160e6933b2ee0ad7438909a74ebafd871bf79bdb3fa47f9bbbe0 diff --git a/srcpkgs/swayrbar/update b/srcpkgs/swayrbar/update new file mode 100644 index 00000000000..3cebd62d640 --- /dev/null +++ b/srcpkgs/swayrbar/update @@ -0,0 +1 @@ +pattern='Release swayrbar-\K[\d.]+(?=)' diff --git a/srcpkgs/swaysome/template b/srcpkgs/swaysome/template index 82995247fdb..3b8e910ba3b 100644 --- a/srcpkgs/swaysome/template +++ b/srcpkgs/swaysome/template @@ -1,6 +1,6 @@ # Template file for 'swaysome' pkgname=swaysome -version=2.1.1 +version=2.1.2 revision=1 build_style=cargo short_desc="Awesome WM like workspaces" @@ -9,7 +9,7 @@ license="MIT" homepage="https://gitlab.com/hyask/swaysome" changelog="https://gitlab.com/hyask/swaysome/-/tags" distfiles="https://gitlab.com/hyask/swaysome/-/archive/$version/swaysome-$version.tar.gz" -checksum=705a2624c56ac23a1e47dc14b87de76570af1d6e8fb002219392023911d7dd96 +checksum=162e6118be952fe66eac070e57a25f68f8ffe274cdd6cab7bfe64de36d33b409 post_install() { vlicense LICENSE diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index 2f665c3eef2..89c81c00aba 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -1,6 +1,6 @@ # Template file for 'swi-prolog' pkgname=swi-prolog -version=9.2.7 +version=9.2.8 revision=1 build_style=cmake build_helper="qemu" @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="http://www.swi-prolog.org/" changelog="http://www.swi-prolog.org/ChangeLog?branch=stable" distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz" -checksum=fd4126f047e0784112741a874e2f7f8c68b5edd6426ded621df355c62d18c96f +checksum=b331637a57c913c49edcfcb10ddcf6c031278ce93d2411d54542778531abb5c7 CFLAGS=-D_FILE_OFFSET_BITS=64 CXXFLAGS=-D_FILE_OFFSET_BITS=64 diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template index cbe2af69465..dcaad081cf1 100644 --- a/srcpkgs/swirc/template +++ b/srcpkgs/swirc/template @@ -1,6 +1,6 @@ # Template file for 'swirc' pkgname=swirc -version=3.4.9 +version=3.5.1 revision=1 build_style=configure configure_args="$(vopt_with notify libnotify)" @@ -17,7 +17,7 @@ license="BSD-3-Clause, ISC, MIT" homepage="https://www.nifty-networks.net/swirc" changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md" distfiles="https://www.nifty-networks.net/swirc/releases/swirc-${version}.tgz" -checksum=1009c810201cd7846b6e379af26423f1a8bba1b8d1711350986ebde0cd0f81fa +checksum=821637d795455fa3c2c0733180d6e43c3cfc766bd2133922501bd23378f4abc0 build_options="notify" build_options_default="notify" diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template index 42fbd60aee7..11640956a21 100644 --- a/srcpkgs/syft/template +++ b/srcpkgs/syft/template @@ -1,6 +1,6 @@ # Template file for 'syft' pkgname=syft -version=1.11.1 +version=1.16.0 revision=1 build_style=go build_helper=qemu @@ -13,7 +13,8 @@ license="Apache-2.0" homepage="https://github.com/anchore/syft" changelog="https://github.com/anchore/syft/releases" distfiles="https://github.com/anchore/syft/archive/refs/tags/v${version}.tar.gz" -checksum=2a998bc29b5a8a232056e5ea8bbdb2e17289732cbff119db50cac61c5f5d0def +checksum=ebf48d31c816a6d1689ed281cf489bf0813bfdaaa91c67dcb40f21447cf15dfe +make_check=no # tests require a running docker daemon post_install() { syft="${DESTDIR}/usr/bin/syft" diff --git a/srcpkgs/synapse/patches/setuptools_rust_upperbound.patch b/srcpkgs/synapse/patches/setuptools_rust_upperbound.patch index bb7022e0bc4..dd8b106a8d6 100644 --- a/srcpkgs/synapse/patches/setuptools_rust_upperbound.patch +++ b/srcpkgs/synapse/patches/setuptools_rust_upperbound.patch @@ -1,13 +1,13 @@ diff --git a/pyproject.toml b/pyproject.toml -index 9a64507..fc48c98 100644 +index e0afcde..d902670 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -382,7 +382,7 @@ furo = ">=2022.12.7,<2025.0.0" +@@ -370,7 +370,7 @@ tomli = ">=1.2.3" # runtime errors caused by build system changes. # We are happy to raise these upper bounds upon request, # provided we check that it's safe to do so (i.e. that CI passes). --requires = ["poetry-core>=1.1.0,<=1.9.0", "setuptools_rust>=1.3,<=1.8.1"] -+requires = ["poetry-core>=1.1.0,<=1.9.0", "setuptools_rust>=1.3"] +-requires = ["poetry-core>=1.1.0,<=1.9.1", "setuptools_rust>=1.3,<=1.8.1"] ++requires = ["poetry-core>=1.1.0,<=1.9.1", "setuptools_rust>=1.3"] build-backend = "poetry.core.masonry.api" diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 8ef8dd9751b..2e9fb02d44a 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.115.0 +version=1.119.0 revision=1 build_style=python3-pep517 build_helper=rust @@ -18,14 +18,15 @@ depends="python3-jsonschema python3-immutabledict python3-unpaddedbase64 python3-sortedcontainers python3-typing_extensions python3-cryptography python3-ijson python3-matrix-common python3-packaging python3-pydantic python3-automat python3-python-multipart" -checkdepends="$depends python3-parameterized python3-hiredis xmlsec1 unzip" +checkdepends="$depends python3-parameterized python3-txredisapi python3-hiredis + xmlsec1 unzip" short_desc="Matrix reference homeserver" maintainer="Joel Beckmeyer " license="AGPL-3.0-or-later" homepage="https://element-hq.github.io/synapse" changelog="https://raw.githubusercontent.com/element-hq/synapse/develop/CHANGES.md" distfiles="https://github.com/element-hq/synapse/archive/refs/tags/v${version}.tar.gz" -checksum=6489670d60c20445ce2440cc4ecd32fb449afa4df2b5fde0efa24a8ee021e004 +checksum=068045df7f132c575e630a98f5d854458b4e5ca14cc53cca2199b854d55078b0 system_accounts="synapse" synapse_homedir="/var/lib/synapse" diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template index 711fb5bc86e..c7ac960d453 100644 --- a/srcpkgs/synthv1/template +++ b/srcpkgs/synthv1/template @@ -1,6 +1,6 @@ # Template file for 'synthv1' pkgname=synthv1 -version=1.1.2 +version=1.1.3 revision=1 build_style=cmake hostmakedepends="pkg-config qt6-base" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later" homepage="https://synthv1.sourceforge.io/" changelog="https://github.com/rncbc/synthv1/raw/main/ChangeLog" distfiles="${SOURCEFORGE_SITE}/synthv1/synthv1-${version}.tar.gz" -checksum=61e48caee0d4755b69ca423174af9db01fe5420d11d47c08a3153e7592ea682c +checksum=b1398766153f183828bbfde119b84cb70198a8c65554ef4a92e9fe458367f271 diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template index 2e923d5a62c..1789235464a 100644 --- a/srcpkgs/tailscale/template +++ b/srcpkgs/tailscale/template @@ -1,6 +1,6 @@ # Template file for 'tailscale' pkgname=tailscale -version=1.76.1 +version=1.76.6 revision=1 build_style=go build_helper="qemu" @@ -15,9 +15,9 @@ short_desc="Easy, secure, cross platform WireGuard, oauth2, and 2FA/SSO" maintainer="classabbyamp " license="BSD-3-Clause" homepage="https://tailscale.com" -changelog="https://github.com/tailscale/tailscale/releases" +changelog="https://tailscale.com/changelog" distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz" -checksum=ce87e52fd4e8e52540162a2529c5d73f5f76c6679147a7887058865c9e01ec36 +checksum=1603c78a6a5e9f83b278d305e1196fbfdeeb841be10ac2ddb7ea433c2701234b post_install() { for sh in bash fish zsh; do diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template index 20237035e8f..43efffc527d 100644 --- a/srcpkgs/tbb/template +++ b/srcpkgs/tbb/template @@ -1,6 +1,6 @@ # Template file for 'tbb' pkgname=tbb -version=2021.13.0 +version=2022.0.0 revision=1 build_style=cmake configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF" @@ -11,7 +11,7 @@ license="Apache-2.0" homepage="https://oneapi-src.github.io/oneTBB/" changelog="https://raw.githubusercontent.com/oneapi-src/oneTBB/v${version}/RELEASE_NOTES.md" distfiles="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${version}.tar.gz" -checksum=3ad5dd08954b39d113dc5b3f8a8dc6dc1fd5250032b7c491eb07aed5c94133e1 +checksum=e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a make_check=no # checks fail upstream on i686 case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template index 0077d57cdb1..3210556629f 100644 --- a/srcpkgs/terragrunt/template +++ b/srcpkgs/terragrunt/template @@ -1,6 +1,6 @@ # Template file for 'terragrunt' pkgname=terragrunt -version=0.68.4 +version=0.68.15 revision=1 build_style=go go_import_path="github.com/gruntwork-io/terragrunt" @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/gruntwork-io/terragrunt" distfiles="$homepage/archive/v$version.tar.gz" -checksum=60c259d787eb74fc8d442dad33e2f697ab8498970b7fc71ea3d2a3c45cd9fb6f +checksum=25ee7b8af090d6dbac3502502678733dc175020daf57fde5d2fde6033c7d13b1 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template index b6a990b18f2..de3fbdceae5 100644 --- a/srcpkgs/texlab/template +++ b/srcpkgs/texlab/template @@ -1,6 +1,6 @@ # Template file for 'texlab' pkgname=texlab -version=5.19.0 +version=5.21.0 revision=1 build_style=cargo make_install_args="--path crates/texlab" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://texlab.netlify.app/" changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md" distfiles="https://github.com/latex-lsp/texlab/archive/refs/tags/v${version}.tar.gz" -checksum=ad72171dd267fd73ecc6a05f9ff3cc068e77a3b82f986305ab455aeade841294 +checksum=723099514ffb7a6537f486de951ae2cfd97d2ae6420aa1ff8eb6ed4068ecb160 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then broken="smartstring fails to compile" diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index 9e043966033..5cc6d584993 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -1,25 +1,25 @@ # Template file for 'texstudio' pkgname=texstudio -version=4.5.2 -revision=2 +version=4.8.4 +revision=1 build_style=cmake configure_args="$(vopt_bool multimedia TEXSTUDIO_ENABLE_MEDIAPLAYER)" -hostmakedepends="pkg-config qt5-qmake qt5-host-tools" -makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel - kdeclarative-devel hunspell-devel quazip-devel - $(vopt_if multimedia qt5-multimedia-devel) - $(vopt_if poppler "poppler-qt5-devel poppler-cpp-devel")" -depends="qt5-svg" +hostmakedepends="pkg-config qt6-base" +makedepends="qt6-svg-devel qt6-tools-devel qt6-qt5compat-devel + kf6-kdeclarative-devel hunspell-devel quazip-devel + $(vopt_if multimedia qt6-multimedia-devel) + $(vopt_if poppler "poppler-qt6-devel poppler-cpp-devel")" +depends="qt6-svg" short_desc="Powerful Tex/LaTeX editor based on texmaker" maintainer="Piraty " license="GPL-2.0-or-later" homepage="https://texstudio.org/" changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/utilities/manual/CHANGELOG.txt" distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz" -checksum=d43dd21a111aacf57e40b0ee27c94b9923f8fdbddec5bad919596abf9a03f3cf +checksum=aec719cb21b788a41576375eeeba734600a54ff64130dd93f5d0da1efa37414c build_options="multimedia poppler" -desc_option_phonon="build with qt5-multimedia (=media support for pdf preview)" +desc_option_phonon="build with qt6-multimedia (=media support for pdf preview)" desc_option_poppler="build with poppler (=internal pdf preview)" build_options_default="multimedia poppler" diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 5302fefe7c4..55218d1cb0e 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=128.3.0 +version=128.4.2 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -106,69 +106,69 @@ _pkgtmpl() { usr/lib/thunderbird/extensions langpack-${_lang}@thunderbird.mozilla.org.xpi } } -checksum="df934ff3958efb07b6bc8f00a44fe46aa64ea5d08993784ceb4b0c9c307acb25 - 5f0347100756a8fa2d69a057688ed2c33cd4d0ae85b566c79b40e3df3cc53fad - 651453a5823eecaa2a843a2f2e1df5b742803a28a653ca68ba422e16fa04f8f0 - 1e2bb62f1e222e6df255653d07bee78429c644dadad91fd48fb07e3cd242fdd4 - cc68db8e5ebc8ae0b8d4023f33cb4ccaea2a61dbd9541584b007e8d40a88ef68 - c869e0c629b479c6221a25926d1fbb512dc0296e0c3e83dfd8d7e43014954db3 - 5c839528417792d13bfebf8d186e4747d83246e69139e3d697df2b61eb9679e0 - 027e4a7c0f3d8016c5deb455110021c5b58accbd4797b363774a7029c55a6ec7 - ecdf67b238b77b350c0bd99594ce965b4dce379a6feebc37fb9478bc8700219b - a382de408d941f2b7b2a21e5361b8fa33bf4664ffe69d4ee05eb1197908f92df - f4420041392d944b4ef4f63c092a05901af9d4fbc4370f6e48e5bdaa4e8bab97 - 70544eef8a134ffbd2d121fff730cbb0a00b26ae3d140321c33ee103863cffbd - 31c8a4cad16912a1b9b6fbe7798730d64154e02a53ec7585fcd2d4638e44f7fb - 42020d61f85038985aa9ccaf07a81a93fb41297a1fb140406d1fe1523ed35885 - 1ecde5fa2e49a2ef10c48ed3d6da40163972f6ebbc3a81d2a906d534dc3f9837 - 86a90d3f4c50d36b4bf8be148c0eafb883a6c77206ca7d0fccd7b7622dfbdcea - 58cf5d13cfec1759d5bd6312e2b7358d28abdb03a2368f66ab44ecdbc3dec488 - 190969c9a5c247f81c9f0ea8243674fd3638a2caf8e60685bdeb3a5678002302 - 9bb69ea05d88de7e1605effe11e49c5c18a9987b372c9a46a4b258297437b2d1 - 3f46d677712d4df38f404df4046ff8774964b407cb585e4d5d25fce74f680165 - ead0cd4db64807e6d8aa16528658ca7d1630f202d3d6e48981a624ce9a600d2f - f5778cc2495685e8c7c70d83ccf3a680c7e081b0f2bfe09c6f8421fc421adc31 - 6ac74e6a4e84716625f3f2efa70c3d79de61ce3f1991c7edd9815b0aacf00123 - 548bcc54c94e6779ee3742ad4b2dde1ea76d76f22f499dec00a0ec12513fb276 - 32ca08b31867b350a99eb10ad92115d10c18c42576f9d95a6ccd81b97334fc12 - 475f7639a45fa6d4a6ad6972ba349caab7366f20a427df6dff7f5c02b58baeb9 - bc67476029e0e26329e3eefcbae027913adf84b90eb5f358f172bff011307f26 - 001e19e0c22b2724c3e3750ca296be47b3545892c9a68c3669fc74f5dc9a4859 - 46b68bcc930d5725f3e5c63f8ab04b45d17db1c801f7ec7d889318d3d537a2d0 - 814cc049e3a4209041cf40e71cafb7cc184ec49d2fc6bd0214c7f1844ac0e11a - 1bc2c79c2a101779d0458876475bc5eaf051c2fd0b2b90bd5e83db6efdfeb0af - cda4f57637cf812937f688260687128c126574c04bae1485b235d52fd0d41020 - 739bdbc87fc4e873ae2ae963fb3f1516073eb3d3b534f263fb63473de8525c7d - 7e246fe84c2cd875aea982d3478b490ac20b6f82eb4290b2350d19f50759938c - 87923cc2dc8f5ab32c49a2dcade31b76557e9f60214d55bc2f507b3601b9c679 - f9ec0ebf111be027856add79b1b4e13131b1d7109fe69b5bedce0f273e411973 - 50996786954f752af50e6ff3f7080bfe82a2a3a9cb94d2d3ec5ca9fc6888de06 - df65ff48c889c8d123a9e0617c88e8fb503790fa8fa8737fe5bfaae3c23ff446 - e5cc12e5eb495758a111c87a360894089557833903a7f24b46fb2ee3599c9088 - 82d5353374d5894754e00caada4562af3bbfffb6ff6371ece12567ed4bdc12f2 - f1fd00085828b2cde157ea41e77b436f98690dbba7af020f9e6d3f93bb63afd5 - 0ff159bab5094e1e3f366298aa0ce98d3a4c545cfeec024cf9efa884dd835209 - 749628239a94df793d1519e3858e4e4b08c47542adc47f1233170efbb74082d8 - 2089a729240665848880774ab7995fda7d214fd1cd396cebcaed8ca3d185c3ad - f1c395724d5a508957075a204b8f867418c8777a2cc8fd487e9a52be4474f73b - 1470e913e6dce4cff08af5e1f24947c019784e4ffe0bcd9ebe7e06d5a741edd4 - 433c01854479e1cf4b3ea63eb4ef529008fc30f293fd90e2aab737b28e655a5b - 248f216b3b21e2933375f048a30bea38b5896e2b8e47a1f0336d58c1b75acf87 - 8187c311e72e173c11ac2545d69bb858cb53acead5937220849afc7675468b49 - ad09e76f93c292027e222ba8097ee31b832ba9eac36033e538baf6e0742c6cd8 - 4a991271fb3cd6342fe3b098d57518eccfe641df971f00a52a928bd15e1f1027 - 5365c8781166cc411776fcb5242a5cc7fb3ae4a3e852e34cfb3a6dc6c20119ff - 821d0af9788ba7dccd08c83c6b5b6bab939aacdb1a8b97f708701dd7db3e3a2b - d32f14fa35d362c1ae3370766b7463c6f6cd4b6aacf9c035b42e58a87abd735c - 6da93ee5917635176b90a02b91b809ee0972ae3096f37b45307f4fb7860342d5 - 046ed067de5a3a2966391b6eb22d9fb62431f7e7c8f13ed4048f853acef90314 - a9727feeab45c4028ca5f5261aeaa495038dc26237c5c2cce5835cf16ba77a55 - 849e14592c9276fd8b5490b084147cd05137c32f5b2df7553ca10118777edc20 - bec071c9e3bdab0a9bdae82cec23d85e17c902d4f44ca71ec0e4d1b8a3d475a7 - dfa7bb9076c7d953a2d7b9d00359151b2b5a694970ca9176e919675c9fa4e89a - 756849c31b53274ff078a7c8c28ed9aa06ceb01465784fb5fb45d0ded4c5a7b2 - e07d0ce92c691d81ec0f998a9c3b870c408b3964b0f2f222cf39931e4597e901 - 58bf03c706f68b117728b1699a272b69b88ba6d5aec1373596f6f48a5bc9a002 - 5b00c2285cf203c2697264c8f52594cdff5015b45b51b085be6a9d526ec63362 - 0917c9571fc87f79fdfbf035c977d4d5f85a001a18d754accc77832fd00fbd9e - d2ad0f8c28e58cbe051b8f41b59a003cb5004edb5d23e41e1f77128170d91fc7" +checksum="04b470728dd4db26cb50a0689cd1302ede59534545cd616e4048acccd423a00a + ec989ffd265f35751ba1d874d76b243325c5c2919dbdc52a842707e4d414979f + 77c07d5dfd453e41a1f642fa13f37aff0c300f7d332eb2d2ba77a2240d6d3b14 + 118488d62a0f99a7a14428d7cad6cc892d51c26a0fab6c4d7eaaa195349bffb8 + 2b94d42160d50f343274d930f4eac385523a00b6c9b3ac386699aad66c90bb59 + 92622a8bc14149d836282c72b04ea2bdcf57359a035c4de0f0fabc0a2e89d965 + 13faed04f4ade32c6c10f287c188c1cedeee1a995b86f92e313864f443a4fc75 + 8f581c1a68b20e45fc75ca03d86304db12cd1fecfe5134b694ed359b9977f389 + 435b7002697dea259fb5079edae4b2f05199aaeb1efeb4709e08fb35fbb39553 + c220e1e52a59d62eecbb3b600bc1fd051236395280e7c9739f44289f3ee2ea92 + 25b97d456ca85fc0f6bd90fa6958fb5e69815759071eb0ae41a04bf35582d0cc + 0e1d6761c70ed9de46becd20b8f13cffb2b1e88c853f03ec2f68293ab5e57aeb + 79a261fd788bc29d8dc0ba5356baa15d55cbf61ef112b52f5cd9413a9ce2743f + 3bacf668cf77978cc4f12c38f8822828cb27fa2540b379400745af28791243d4 + 63f832cc2c6b482d9f60ad8f648cc0d341dac5460048585bb1a8f4f15911ef7e + 786415e8c7d27bbde410dbf4ad70b784c062e88c42ee92f1ef93a69e662a6ba0 + abeb853fc8bf453fabb2b36e168d0593bb601a4bba7dc72fff86f63a96b062ec + bd301a6dce7abc1259ee6315d0cbef19a668269bc931af201483bad582ab96c3 + 95e141ba7aa86be3cea54051aab5af69d9ce8957c510588e75fc1220a2854c8e + 2f34ca5544c1de75232dab638463e41e18f8a25ccaa4a85f6456c17a98299cea + a629e82892abcb5caccba5946251a03d72297da76a32fc1e9bbb6a8a342cbf78 + 80142e217fdeaca1d987e76f63231aa24721214f68505e8348df10d7eb4d3fd7 + b5f7a66d5e08bbbd6f6d335a5551460ec4b2da0b757426bcf49b05339022416c + 9a1a77f58f2db1f15ea510e1bffaa162f3c26dd795c5f5aef55e495107f2f784 + 7b0732ce5ff033e848aaff81f45fe87b818887106f0f04f2fef05ebfbf2174ab + 266b74ea23a5da6c609bd701f2ef08871f706f3ff4e4d2c9e3b91db63cd9bf02 + 3e40671d4e67073bd6ff6dc80986d3dcde217009e26e89e8ab68350e75b28947 + 1eea542fbdb1855ec51a9b471c266bbd0c4061dfa0c6c7937d20e508e92a0a59 + 6fb69ac87d50eb4c506071bbe5a17db77e264964f4757cc1a412da9776c9bc20 + 360c268bcc8b252bde88d40fb90cc607df3751f4c1a94aa737e0a0f462d47d70 + b2d0b53f69e1fef992fc9ace39095d4a711eb046d13c1f151c599297c48cb2ab + b797d9a2ebff460ba3a537ce20c292099a9f43590a9d56a90223b20e85201017 + b648c3803656f4114215bf47cf2fa009ed4ee773967bdb19142e451c3771cc36 + 7567123ff61178704cd368092b349b79c0dfe6cb8f775602878e5af8798ba145 + 40c27a499863ea0da4a57a908f9ab77d6cc3d02a419d1dc90ed39bdf5c1ea89b + ada6d8f45c902ed784ee72205eb0e3254863c1921b96928d5d7b07214103f39b + 1a0e752274beee3b408a71afcf39c46074a73a28bf5dc26eac054b121ec8a491 + c5ff7dd5554c0fa940876a06ccc8ba751b5082f7b0ba99160487c5b250914a64 + 38549b673f1a3a257b8e76ef6f4a9919c02e9bc46c419cee918c45284b5747d1 + a3c09cf06849db0a5a35c3e5b230369435fc50b4c2007968da106c3894ecb5e1 + 587610d5f091c2d106d652969bf8a1267782e5206bd72192eaf8503b88fdbffb + c0e8f1c1625ab6c543fa13fee38db01975db789d072b36fd8aae80b4975c468c + 3a6d2c8e016ce8a3386e84a5703f6fea1db6de7ba2ad23248cffaca5b55f376d + c23d10a9074e2d495fcf4c88480bcbceb49a9df857935a174f9188928ea23de0 + 906174388605c89fd704d64a1343dbda75ee010f9f84e953f9659872c9ae03e0 + 432c76afb91a9f9833e27d84f7cf7e6c3415c1a297cb71b0f1c7a4446bf0d017 + f3dd9ff67a85839c2ea694a826eb2fdf7d6946c1b099e0d9b6aa4712f39e0ed9 + 69b6db02e8a10469522d2178f7d091e570ec57d4d728629c4464e4b3886c786c + 86f90eb87d60b62b610cc59c159dad0feb4b57814732491b2102fdf80c2ecdfb + d23693dcb8a100458aaefd1feb99b23f4ad07c87a77a6767c659d5c3f34cec37 + 97658100cd4658e1fc69c611d2ad7ee81450940fe5a6861126282c3914e80942 + e29e0b476ffbbebf1114ed12214b6e98128899e977a9a973911cc6fe2829f3c0 + 64e20d98fdb48135e2cc91346a40d976b9062f0f8ad1012a3e5a13e457076063 + b750e3ca4ad8e79f316a5c97cda4edeecf1a9b04ad34ddeea21bf5af7f7c366c + 9502c626eaf564c39cc0451661b163246c8340d25290a4f1e41cf21785b93628 + 10aaaaa434c7adc96d79f3ecc48a59058937416efa76e797cf90a6fdf925d818 + dc2a9be7f2fedb8a43dfd218c6ea69d249425a7d9154d17e203670267a61ef8d + ce3a9f90f6d92392c6ea74b8660b3bc14b1f7d324b2c9fb0fe55fb6e6168c527 + 49c02e477cc379de2851d83c153d78bbbf9fc4f1fa645e81eae42c095bb97476 + 8c0aff88f56d029badc3e2943f8fed3320e6c8f726972bf02f3770ea7c5912f6 + 5c4014e47c8bba2ec79b545cb50683afc6256aacc215bc7231042df9622fbc9a + cb35777bee55e7800d7a70e2249f8efc17c2620f8f73b5eac6d1150957e8143c + 5378418cead508597911b3b839dd3e14a1453ecb15619447bdb2bfa27add767c + c6056d4430c1f102c02ea752369a44cba73cf66772a54efe1ee9f61dc72513c4 + a764e2bc2cbde4ce872a9b3752a3e7dd7edf158d7a459f32a7ac1c23d6f910e4 + 55395fcf44d60ceb1bf3c5b26243158f0aee6f4839adda535fc6cf2d46a60e70" diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index a973ea706cc..08fa19c7460 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=128.3.0 +version=128.4.2 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,7 +11,7 @@ maintainer="dataCobra " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/thunderbird/releases/${version}esr/source/thunderbird-${version}esr.source.tar.xz" -checksum=160d961930713e8797d8f9f35417fcdd954fd5e19f50d437bf8ae85dd4a13c2f +checksum=6fa81eeabb89f02792738718168586bd75c07dc9256e79b26438da70e80dd0d8 lib32disabled=yes diff --git a/srcpkgs/tilda/template b/srcpkgs/tilda/template index 88478a49109..da64b3ebaa2 100644 --- a/srcpkgs/tilda/template +++ b/srcpkgs/tilda/template @@ -1,6 +1,6 @@ # Template file for 'tilda' pkgname=tilda -version=1.5.4 +version=2.0.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake gettext-devel glib-devel" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/lanoxx/tilda" distfiles="https://github.com/lanoxx/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=c9528b0e9af6f5a35db9ca695b3edbb6709755e82afdfc3cdb75a406ddc67523 +checksum=ff9364244c58507cd4073ac22e580a4cded048d416c682496c1b1788ee8a30df pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/tlp/template b/srcpkgs/tlp/template index fc594f40a37..04360b3c395 100644 --- a/srcpkgs/tlp/template +++ b/srcpkgs/tlp/template @@ -1,6 +1,6 @@ # Template file for 'tlp' pkgname=tlp -version=1.6.1 +version=1.7.0 revision=1 depends="hdparm bash iw util-linux ethtool perl" short_desc="Advanced power management tool for Linux" @@ -9,7 +9,7 @@ license="GPL-2.0-or-later" homepage="https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html" changelog="https://raw.githubusercontent.com/linrunner/TLP/main/changelog" distfiles="https://github.com/linrunner/TLP/archive/${version}.tar.gz" -checksum=f7d013691a92ffcf42ef1648565dbc24a33202046d3c8138dad1963a3169a0f5 +checksum=547ff90bef0ea035f0ff6d7546d0d867690ebf60beec426885a884ee8d023e2e conflicts="laptop-mode>=0 perl-Unicode-Tussle>=0" conf_files="/etc/tlp.conf /etc/tlp.d/*.conf" diff --git a/srcpkgs/tlpui/template b/srcpkgs/tlpui/template index cf24c24db6f..6b1c4b31386 100644 --- a/srcpkgs/tlpui/template +++ b/srcpkgs/tlpui/template @@ -1,6 +1,6 @@ # Template file for 'tlpui' pkgname=tlpui -version=1.6.4 +version=1.7.1 revision=1 build_style="python3-pep517" hostmakedepends="python3-poetry-core" @@ -10,7 +10,7 @@ maintainer="André Cerqueira " license="GPL-2.0-or-later" homepage="https://github.com/d4nj1/TLPUI" distfiles="https://github.com/d4nj1/TLPUI/archive/refs/tags/tlpui-${version/+/-}.tar.gz" -checksum=6ad6fb4bee0a18b1c113f5eb3fb10d09c4249a8df323927af24d54e8d0e1325f +checksum=3d94beeb34c6b89ea80e01263a5b0535421c925181782bc50c702957b4393924 make_check=no #tests fail inside chroot post_install() { diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template index fa6f3cd50dd..8cd267accd1 100644 --- a/srcpkgs/toot/template +++ b/srcpkgs/toot/template @@ -1,6 +1,6 @@ # Template file for 'toot' pkgname=toot -version=0.44.1 +version=0.45.0 revision=1 build_style=python3-pep517 _depends="python3-click python3-requests python3-BeautifulSoup4 python3-wcwidth @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://toot.bezdomni.net" changelog="https://raw.githubusercontent.com/ihabunek/toot/master/CHANGELOG.md" distfiles="${PYPI_SITE}/t/toot/toot-${version}.tar.gz" -checksum=2887ba4c81c0a28448b260804ba6ac1f16178c188cd3a04621912acf764c9bd7 +checksum=ba209fe60c22f4efda7d882381492ca8639d52c60b6012eb1a10ae1ca70db7cf post_install() { for shell in bash zsh fish; do diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template index 227905ce1b1..1177bd1f436 100644 --- a/srcpkgs/tox/template +++ b/srcpkgs/tox/template @@ -1,6 +1,6 @@ # Template file for 'tox' pkgname=tox -version=4.18.0 +version=4.23.2 revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" @@ -15,7 +15,7 @@ license="MIT" homepage="https://tox.wiki/" changelog="https://raw.githubusercontent.com/tox-dev/tox/main/docs/changelog.rst" distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz" -checksum=5dfa1cab9f146becd6e351333a82f9e0ade374451630ba65ee54584624c27b58 +checksum=86075e00e555df6e82e74cfc333917f91ecb47ffbc868dcafbd2672e332f4a2c do_check() { # Running via PYTHONPATH breaks a few tests so we use a venv diff --git a/srcpkgs/tqsl/template b/srcpkgs/tqsl/template index 6181f74b2dc..e47f246c37d 100644 --- a/srcpkgs/tqsl/template +++ b/srcpkgs/tqsl/template @@ -1,6 +1,6 @@ # Template file for 'tqsl' pkgname=tqsl -version=2.7.3 +version=2.7.4 revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 @@ -12,7 +12,7 @@ maintainer="classabbyamp " license="custom:ARRL" homepage="https://www.arrl.org/tqsl-download" distfiles="https://www.arrl.org/tqsl/tqsl-${version}.tar.gz" -checksum=09af4fb32b633efad4e2ef9bff1ea921b41cf020cd588ea134cea317ad0176cf +checksum=d9fb7226c82b804cfed927c8843515c2374fe3f34bbef02c61dc053413e84f82 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template index 1ed08c65b89..c7d5b0668dc 100644 --- a/srcpkgs/traceroute/template +++ b/srcpkgs/traceroute/template @@ -1,13 +1,13 @@ # Template file for 'traceroute' pkgname=traceroute -version=2.1.3 +version=2.1.6 revision=1 short_desc="Traces the route taken by packets over an IPv4/IPv6 network" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://traceroute.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/traceroute/traceroute-${version}.tar.gz" -checksum=05ebc7aba28a9100f9bbae54ceecbf75c82ccf46bdfce8b5d64806459a7e0412 +checksum=9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e alternatives=" traceroute:traceroute:/usr/bin/linux-traceroute diff --git a/srcpkgs/tryton/template b/srcpkgs/tryton/template index 2c179e0eb38..5ec0cce6121 100644 --- a/srcpkgs/tryton/template +++ b/srcpkgs/tryton/template @@ -1,6 +1,6 @@ # Template file for 'tryton' pkgname=tryton -version=7.2.7 +version=7.2.8 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.tryton.org" distfiles="${PYPI_SITE}/t/tryton/tryton-${version}.tar.gz" -checksum=6c7c3f5a247c4949c972bc880a12b0e703332b93e8bff60be0443bf35d45d676 +checksum=20cf945246fe6a5bc46f440c2157cdf149cb7ec9319e6391e6367c718efeba3c post_install() { vinstall tryton.desktop 644 usr/share/applications diff --git a/srcpkgs/tuxedo-drivers/template b/srcpkgs/tuxedo-drivers/template index 4b6cfbd4706..2cf0e76e902 100644 --- a/srcpkgs/tuxedo-drivers/template +++ b/srcpkgs/tuxedo-drivers/template @@ -1,6 +1,6 @@ # Template file for 'tuxedo-drivers' pkgname=tuxedo-drivers -version=4.7.0 +version=4.10.2 revision=1 depends="dkms" short_desc="TUXEDO hardware drivers" @@ -8,7 +8,7 @@ maintainer="newbluemoon " license="GPL-3.0-or-later" homepage="https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers" distfiles="https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers/-/archive/v${version}/tuxedo-drivers-v${version}.tar.gz" -checksum=ce58475e394ef4dff810dbc2a62f08004120c5f5b96159c245e427eae2e7fec3 +checksum=d69f4ba9de3fe92514e6ada168caae813f523bf23687484972ea3a6c6d1365e4 dkms_modules="tuxedo-drivers ${version}" diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template index 8a62264465f..50005385106 100644 --- a/srcpkgs/twitch-cli/template +++ b/srcpkgs/twitch-cli/template @@ -1,7 +1,7 @@ # Template file for 'twitch-cli' pkgname=twitch-cli -version=1.1.14 -revision=4 +version=1.1.24 +revision=1 build_style=go go_import_path="github.com/twitchdev/twitch-cli" go_ldflags="-X main.buildVersion=$version" @@ -10,4 +10,4 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://dev.twitch.tv/docs/cli" distfiles="https://github.com/twitchdev/twitch-cli/archive/refs/tags/v$version.tar.gz" -checksum=2a12e5b8f3e29eb84345db7f2ee96cfc6df09dc6a78947032231dbdb0bcf71af +checksum=8f796e1413b5b9f6d159cbdf5296acb22851822c024f6545acd707a71219a239 diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index c5ce9c520ce..4bb80ffb4dc 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=6.5.0 +version=7.0.4 revision=1 build_style=gnu-configure makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://github.com/Genivia/ugrep" distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz" -checksum=eec1ddcd17dcc017987caad916ed245adef5ccc151837eefae5f86047fae0d99 +checksum=ba5382cec79d902c68eaec0d0dc63b688e2dd2d448649336ce4222c763581a9b case "$XBPS_TARGET_MACHINE" in armv*) configure_args+=" --disable-neon";; diff --git a/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch b/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch deleted file mode 100644 index 499549c3f73..00000000000 --- a/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 164e2eb050b5fec25033124834cf49ea1a7d8cbb Mon Sep 17 00:00:00 2001 -From: multiSnow -Date: Thu, 7 Feb 2019 01:03:47 +0800 -Subject: [PATCH] replace process-kill-without-query with - set-process-query-on-exit-flag - -see https://www.gnu.org/software/emacs/news/NEWS.22.1 and https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=f1c48b0ec521744826ed43ae27eed0e152c472bf ---- - emacs/uim-helper.el | 2 +- - emacs/uim.el | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git emacs/uim-helper.el emacs/uim-helper.el -index e86e32d06..19ecd4538 100644 ---- a/emacs/uim-helper.el -+++ b/emacs/uim-helper.el -@@ -106,7 +106,7 @@ - (if (not proc) - (error "uim.el: Couldn't invoke uim-el-helper-agent.")) - -- (process-kill-without-query proc) -+ (set-process-query-on-exit-flag proc nil) - - ;; wait "OK" - (let ((patience uim-startup-timeout) (ok nil)) -diff --git emacs/uim.el emacs/uim.el -index 9110c3cb6..7e1fadbba 100644 ---- a/emacs/uim.el -+++ b/emacs/uim.el -@@ -488,7 +488,7 @@ - (error "uim.el: Couldn't invoke uim-el-agent.")) - - ;; don't ask kill -- (process-kill-without-query proc) -+ (set-process-query-on-exit-flag proc nil) - - ;; wait "OK" - (let ((patience uim-startup-timeout) (ok nil)) diff --git a/srcpkgs/uim/patches/uim-kde.patch b/srcpkgs/uim/patches/uim-kde.patch new file mode 100644 index 00000000000..dfac6b55643 --- /dev/null +++ b/srcpkgs/uim/patches/uim-kde.patch @@ -0,0 +1,80 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1449,6 +1449,28 @@ + + AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes) + ++dnl **************************** ++dnl *** test for KDE5 applet *** ++dnl **************************** ++AC_ARG_ENABLE(kde5-applet, ++ AC_HELP_STRING([--disable-kde5-applet], ++ [do not build uim KDE Plasma 5 widget]), ++ [], ++ [enable_kde5_applet=yes]) ++ ++if test "x$enable_kde5_applet" != xno; then ++ if test "x$with_qt5" != xyes; then ++ enable_kde5_applet=no ++ fi ++fi ++ ++if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then ++ AC_MSG_WARN([no CMake found]) ++ enable_kde5_applet=no ++fi ++ ++AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes) ++ + AC_ARG_ENABLE(pref, + AC_HELP_STRING([--disable-pref], + [do not build graphical utility to edit user settings]), +@@ -1883,7 +1905,6 @@ + cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}" + cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}" + cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true" +- cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false" + fi + + if test "x$with_qt4" = xyes; then +@@ -1948,12 +1969,15 @@ + qt5_immodule_option="DEFINES+=QT5_IMMODULE" + fi + set -e +- # FIXME: move CMAKE_CXX_FLAGS into cmake_option +- ${CMAKE} \ +- -B ${ac_abs_top_builddir}/qt5/applet.cmake \ +- -S ${ac_abs_top_srcdir}/qt5/applet \ +- -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \ +- ${cmake_option} ++ # Generate a Makefile for KDE5 applet by cmake ++ if test "x$enable_kde5_applet" = xyes; then ++ # FIXME: move CMAKE_CXX_FLAGS into cmake_option ++ ${CMAKE} \ ++ -B ${ac_abs_top_builddir}/qt5/applet.cmake \ ++ -S ${ac_abs_top_srcdir}/qt5/applet \ ++ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \ ++ ${cmake_option} ++ fi + ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \ + ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro + ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \ +@@ -2007,6 +2031,7 @@ + Qt5 immodule : ${with_qt5_immodule} + KDE3 Applet : ${enable_kde_applet} + KDE4 Applet : ${enable_kde4_applet} ++ KDE5 Applet : ${enable_kde5_applet} + FEP : ${enable_fep} + Emacs : ${enable_emacs} + XIM : ${use_xim} +--- a/qt5/applet/Makefile.am ++++ b/qt5/applet/Makefile.am +@@ -6,6 +6,8 @@ + plasmoid + + if QT5 ++if KDE5_APPLET + all clean install uninstall: + $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@ + endif ++endif diff --git a/srcpkgs/uim/template b/srcpkgs/uim/template index 1a782b680f7..1615a2d8025 100644 --- a/srcpkgs/uim/template +++ b/srcpkgs/uim/template @@ -1,7 +1,7 @@ # Template file for 'uim' pkgname=uim -version=1.8.8 -revision=5 +version=1.8.9 +revision=1 build_style=gnu-configure build_helper=qmake configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3 @@ -16,7 +16,7 @@ maintainer="Kazuho Sakoda " license="BSD-3-Clause" homepage="https://github.com/uim/uim/wiki" distfiles="https://github.com/uim/uim/releases/download/${version}/uim-${version}.tar.bz2" -checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc +checksum=dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4 CFLAGS="-fcommon" diff --git a/srcpkgs/unibilium/template b/srcpkgs/unibilium/template index e70d3a0dc7d..a290410460a 100644 --- a/srcpkgs/unibilium/template +++ b/srcpkgs/unibilium/template @@ -1,25 +1,20 @@ # Template file for 'unibilium' pkgname=unibilium -version=2.1.1 +version=2.1.2 revision=1 -build_style=gnu-makefile +build_style=gnu-configure make_check_target="test" -hostmakedepends="libtool perl" +hostmakedepends="automake libtool perl" short_desc="Simple, self-contained terminfo library" maintainer="Orphaned " license="LGPL-3.0-or-later" homepage="https://github.com/neovim/unibilium" -changelog="https://github.com/neovim/unibilium/raw/master/Changes" -distfiles="https://github.com/neovim/${pkgname}/archive/v${version}.tar.gz" -checksum=6f0ee21c8605340cfbb458cbd195b4d074e6d16dd0c0e12f2627ca773f3cabf1 +changelog="https://raw.githubusercontent.com/neovim/unibilium/refs/heads/master/Changes" +distfiles="https://github.com/neovim/unibilium/archive/v${version}.tar.gz" +checksum=370ecb07fbbc20d91d1b350c55f1c806b06bf86797e164081ccc977fc9b3af7a -do_build() { - if [ "$CROSS_BUILD" ]; then - cp /usr/bin/libtool . - vsed -e "s,CCLD=.*,CCLD=$CC,g;s,CC=.*,CC=$CC,g" -i libtool - vsed -e 's,libtool,./libtool,g' -i Makefile - fi - make ${makejobs} +pre_configure() { + autoreconf -fi } unibilium-devel_package() { diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template index 51991a69dfc..1285e76cd11 100644 --- a/srcpkgs/unison/template +++ b/srcpkgs/unison/template @@ -1,6 +1,6 @@ # Template file for 'unison' pkgname=unison -version=2.53.5 +version=2.53.7 revision=1 hostmakedepends="ocaml" short_desc="File-synchronization tool" @@ -8,12 +8,20 @@ maintainer="Andrew J. Hesford " license="GPL-3.0-or-later" homepage="https://www.cis.upenn.edu/~bcpierce/unison/" distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz" -checksum=330418ad130d93d0e13da7e7e30f9b829bd7c0e859355114bd4644c35fe08d23 +checksum=a259537cef465c4806d6c1638c382620db2dd395ae42a0dd2efa3ba92712bed5 nocross="OCaml does not cross compile" +nostrip="$(vopt_if native '' yes)" + +build_options="native" +desc_option_native="Use ocamlopt for native compilation" + +case "$XBPS_TARGET_MACHINE" in + x86_64*) build_options_default="native" ;; +esac do_build() { - command -v ocamlc.opt >/dev/null && NATIVE=true || NATIVE=false - CFLAGS= make ${makejobs} DEBUGGING=false THREADS=true NATIVE=$native + local _native="$(vopt_if native true)" + CFLAGS= make ${makejobs} DEBUGGING=false THREADS=true NATIVE="${_native}" CFLAGS= make ${makejobs} -C man } diff --git a/srcpkgs/usbmuxd/template b/srcpkgs/usbmuxd/template index 7d0e781dffe..93cee835575 100644 --- a/srcpkgs/usbmuxd/template +++ b/srcpkgs/usbmuxd/template @@ -10,7 +10,7 @@ makedepends="libusb-devel libimobiledevice-devel" short_desc="USB Multiplex Daemon" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="https://libimobildedevice.org" +homepage="http://github.com/libimobiledevice/usbmuxd/" changelog="https://raw.githubusercontent.com/libimobiledevice/usbmuxd/master/NEWS" distfiles="http://github.com/libimobiledevice/usbmuxd/archive/${version}.tar.gz" checksum=e7ce30143e69d77fc5aa6fb0cb5f0cfcdbeff47eb1ac7fd90ac259a90de9fadd diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template index d85f3a9a60b..0c63afb02bd 100644 --- a/srcpkgs/util-linux-common/template +++ b/srcpkgs/util-linux-common/template @@ -1,7 +1,7 @@ # Template file for 'util-linux-common' # Keep this package sync with util-linux pkgname=util-linux-common -version=2.40.1 +version=2.40.2 revision=1 build_style=gnu-configure configure_args=" @@ -27,7 +27,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.kernel.org/pub/linux/utils/util-linux/" distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz" -checksum=59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f +checksum=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then configure_args+=" --disable-year2038" diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index cc15af24a20..c6c6a4b0cf4 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,7 +1,7 @@ # Template file for 'util-linux' # Keep this package sync with util-linux-common pkgname=util-linux -version=2.40.1 +version=2.40.2 revision=1 build_style=gnu-configure configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown @@ -23,7 +23,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.kernel.org/pub/linux/utils/util-linux/" distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz" -checksum=59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f +checksum=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template index cc9b73c4d1f..cdee68108cc 100644 --- a/srcpkgs/uv/template +++ b/srcpkgs/uv/template @@ -1,6 +1,6 @@ # Template file for 'uv' pkgname=uv -version=0.4.24 +version=0.5.2 revision=1 build_style=python3-pep517 build_helper="rust qemu" @@ -12,7 +12,14 @@ license="Apache-2.0 OR MIT" homepage="https://github.com/astral-sh/uv" changelog="https://github.com/astral-sh/uv/raw/main/CHANGELOG.md" distfiles="https://github.com/astral-sh/uv/releases/download/${version}/source.tar.gz>uv-${version}.tar.gz" -checksum=917be4e4e96ef555e2c739e3b91eac21b7df6f1b45d80e25fe4e50d1249d6846 +checksum=60465d87552cd6febfdee8c58176d699e00d5549f2d35db3261ec5a113996099 + +case "$XBPS_TARGET_MACHINE" in + i686*) + # if parallel, rustc-LLVM ERROR: out of memory Allocation failed + disable_parallel_build=yes + ;; +esac post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template index 92313820748..51fd1c54934 100644 --- a/srcpkgs/uwsgi/template +++ b/srcpkgs/uwsgi/template @@ -1,6 +1,6 @@ # Template file for 'uwsgi' pkgname=uwsgi -version=2.0.27 +version=2.0.28 revision=1 hostmakedepends="python3-setuptools" makedepends="python3-devel openssl-devel" @@ -10,7 +10,7 @@ license="GPL-2.0-only WITH GCC-exception-2.0" homepage="https://uwsgi-docs.readthedocs.io/en/latest/" changelog="https://raw.githubusercontent.com/unbit/uwsgi-docs/master/Changelog-${version}.rst" distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz" -checksum=a2e1d06dcb12c6566e771aeefa0a5d880c102c77d4c8a3627e2a355c98da855e +checksum=4bb0762c5becb0414352cca664957206df4d6847e9a1c472e87708dc2cdad610 _libdir=usr/lib/uwsgi diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index 94f9c8487a6..61c218eca89 100644 --- a/srcpkgs/vagrant/template +++ b/srcpkgs/vagrant/template @@ -1,7 +1,7 @@ # Template file for 'vagrant' pkgname=vagrant -version=2.4.1 -revision=2 +version=2.4.3 +revision=1 archs="i686 x86_64*" build_style=gemspec depends="bsdtar curl openssh rsync" @@ -11,7 +11,7 @@ license="BUSL-1.1" homepage="https://www.vagrantup.com/" changelog="https://raw.githubusercontent.com/hashicorp/vagrant/main/CHANGELOG.md" distfiles="https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz" -checksum=19cfa306e3ffae5ddbf30504f61a1a3124aa9a87721b130a14098d4ea1febf89 +checksum=65059d4825799412fc5d49cebc2170240164fadc37d2ada54531d1f77a9e6762 nocross=yes repository=nonfree diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template index b553e0ab331..6ed38c63e48 100644 --- a/srcpkgs/valgrind/template +++ b/srcpkgs/valgrind/template @@ -1,6 +1,6 @@ # Template file for 'valgrind' pkgname=valgrind -version=3.23.0 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="--enable-tls --without-mpicc --enable-lto=yes" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="http://valgrind.org/" changelog="https://valgrind.org/docs/manual/dist.news.html" distfiles="https://sourceware.org/pub/valgrind/valgrind-${version}.tar.bz2" -checksum=c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d +checksum=71aee202bdef1ae73898ccf7e9c315134fa7db6c246063afc503aef702ec03bd # https://valgrind.org/docs/manual/dist.readme-packagers.html nostrip=yes diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template index 20038b6523a..64b3f9dcbfb 100644 --- a/srcpkgs/vaultwarden/template +++ b/srcpkgs/vaultwarden/template @@ -1,6 +1,6 @@ # Template file for 'vaultwarden' pkgname=vaultwarden -version=1.32.1 +version=1.32.4 revision=1 build_style=cargo configure_args="--features sqlite,mysql,postgresql" @@ -13,7 +13,7 @@ license="AGPL-3.0-only" homepage="https://github.com/dani-garcia/vaultwarden" changelog="https://github.com/dani-garcia/vaultwarden/releases" distfiles="https://github.com/dani-garcia/vaultwarden/archive/${version}.tar.gz" -checksum=f69d004b2da74d44e981b0013247e4670579836b720edc5843ddd1b35a242031 +checksum=7cf9a5c7356df42b0da318a446bf576c2aa340581ec4c729f1cb616754cf66ad system_accounts="_vaultwarden" _vaultwarden_homedir="/var/lib/vaultwarden" diff --git a/srcpkgs/virtiofsd/template b/srcpkgs/virtiofsd/template index 1afc1d8a13e..cced708fe66 100644 --- a/srcpkgs/virtiofsd/template +++ b/srcpkgs/virtiofsd/template @@ -1,6 +1,6 @@ # Template file for 'virtiofsd' pkgname=virtiofsd -version=1.11.1 +version=1.12.0 revision=1 build_style=cargo makedepends="libcap-ng-devel libseccomp-devel" @@ -9,7 +9,7 @@ maintainer="Matthias von Faber " license="Apache-2.0, BSD-3-Clause" homepage="https://gitlab.com/virtio-fs/virtiofsd" distfiles="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v${version}/virtiofsd-v${version}.tar.gz" -checksum=e45a70b1c764378077f36c15c97975d5a0cc0f0534adbc7c24e5b62da6adb579 +checksum=cb0fc7c781cff01c8e1a05f8c8113c1ae8fd2ef555bc9d1d9ed983438e4c96c4 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then broken="https://gitlab.com/virtio-fs/virtiofsd/-/issues/114" diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template index a7c31d1bddf..ee80066f8b5 100644 --- a/srcpkgs/visidata/template +++ b/srcpkgs/visidata/template @@ -1,6 +1,6 @@ # Template file for 'visidata' pkgname=visidata -version=3.0.2 +version=3.1.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,4 +12,4 @@ license="GPL-3.0-only" homepage="https://visidata.org/" changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md" distfiles="https://github.com/saulpw/visidata/archive/refs/tags/v${version}.tar.gz" -checksum=cc1506b96192de49419a77a3f9606999779ff77d37a7be0806506c32e16d57f7 +checksum=9e693d72d516adca2c52348531af98fef099ab6f09e6523976286b555a7599ee diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index 4c4f2cdce8f..276b11a7331 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -2,7 +2,7 @@ # Permission to redistribute is granted. # see: srcpkgs/vivaldi/files/redistribution-permission.eml pkgname=vivaldi -version=6.9.3447.54+1 +version=7.0.3495.14+1 revision=1 archs="x86_64 aarch64 armv7l" depends="desktop-file-utils hicolor-icon-theme xz libnotify xdg-utils" @@ -16,15 +16,15 @@ skiprdeps="/opt/vivaldi/libqt5_shim.so /opt/vivaldi/libqt6_shim.so" case "$XBPS_TARGET_MACHINE" in x86_64) distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version//+/-}_amd64.deb" - checksum=7053d863dee667ccd7aba936ed78a19f6dbd3681314382b15ae583df75911c29 + checksum=4f541e7b055b6969063cb9d4987f6b2ce59cb642730a27a412cd3c45ab1cf77e ;; aarch64) distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version//+/-}_arm64.deb" - checksum=ec1f12c444a61dbf97b096d4c82d2d20e784903d2dce7542728ddaecf2ff1f73 + checksum=544a834c70665266900b60475d656d33cc888dd1e54cb700de70feb324b00760 ;; armv7l) distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version//+/-}_armhf.deb" - checksum=1870b6cfaaf956f86fde7da2f2000fca23f3e854d5c68566a2b32ae4aa915edb + checksum=9a1915c19a6624624531ec1f4a4719ff41a7c8edd9022e9a10fbef152b510bbc ;; *) broken="No distfiles available for this target" diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template index 215e9f065c2..018e568a7b7 100644 --- a/srcpkgs/vkQuake/template +++ b/srcpkgs/vkQuake/template @@ -1,6 +1,6 @@ # Template file for 'vkQuake' pkgname=vkQuake -version=1.31.2 +version=1.31.3 revision=1 build_style=meson hostmakedepends="glslang SPIRV-Tools pkg-config" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-or-later" homepage="https://github.com/Novum/vkQuake" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=1bcad045bee99784fa40f2c7e05c7f3879944261c1cdcce8eaab5a766681eb26 +checksum=7fe42363e871e358b65115b49ddb5436fa6edb414d2cff3c4012eb0e4bbaf24f do_install() { vbin build/vkquake diff --git a/srcpkgs/vokoscreen b/srcpkgs/vokoscreen new file mode 120000 index 00000000000..81e249e55bf --- /dev/null +++ b/srcpkgs/vokoscreen @@ -0,0 +1 @@ +vokoscreenNG \ No newline at end of file diff --git a/srcpkgs/vokoscreen/template b/srcpkgs/vokoscreen/template deleted file mode 100644 index 94e4012dfcc..00000000000 --- a/srcpkgs/vokoscreen/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'vokoscreen' -pkgname=vokoscreen -version=2.5.0 -revision=1 -build_style=qmake -hostmakedepends="pkg-config qt5-host-tools qt5-qmake" -makedepends="alsa-lib-devel libX11-devel libXrandr-devel qt5-devel qt5-x11extras-devel v4l-utils-devel" -depends="ffmpeg" -short_desc="Easy to use screencast creator" -maintainer="Duncaen " -license="GPL-2.0-only" -homepage="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html" -distfiles="https://github.com/vkohaupt/vokoscreen/archive/${version}.tar.gz" -checksum=7f5d9abfa3b4a1f7ce657838f5169cd80a590be490dacd0ad1751853a38f4245 - -CFLAGS="-fcommon" diff --git a/srcpkgs/vokoscreenNG/template b/srcpkgs/vokoscreenNG/template new file mode 100644 index 00000000000..a4b298b627c --- /dev/null +++ b/srcpkgs/vokoscreenNG/template @@ -0,0 +1,29 @@ +# Template file for 'vokoscreenNG' +pkgname=vokoscreenNG +version=4.2.0 +revision=1 +build_style=qmake +build_wrksrc="src" +hostmakedepends="pkg-config qt6-base-devel qt6-tools-devel" +makedepends="alsa-lib-devel libX11-devel libXrandr-devel pipewire-devel + pulseaudio-devel gst-plugins-base1-devel qt6-multimedia-devel + xdg-desktop-portal gstreamer1-devel" +depends="ffmpeg6 gstreamer1-pipewire gst-plugins-ugly1 gst-plugins-good1" +short_desc="Easy to use screencast creator" +maintainer="Duncaen " +license="GPL-2.0-only" +homepage="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html" +distfiles="https://github.com/vkohaupt/vokoscreenNG/archive/${version}.tar.gz" +checksum=5f74fc575ae18e8e62f13f891d79c1c720077f6b630085a02f7576c223cb431c + +post_install() { + vbin vokoscreenNG + vinstall applications/vokoscreenNG.desktop 644 usr/share/applications + vinstall applications/vokoscreenNG.png 644 usr/share/pixmaps +} + +vokoscreen_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template index fea68e508a2..c8d8c3788c4 100644 --- a/srcpkgs/vttest/template +++ b/srcpkgs/vttest/template @@ -1,6 +1,6 @@ # Template file for 'vttest' pkgname=vttest -version=20240708 +version=20241031 revision=1 build_style=gnu-configure short_desc="Tests the compatibility so-called 'VT100-compatible' terminals" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="http://invisible-island.net/vttest/vttest.html" distfiles="http://invisible-mirror.net/archives/${pkgname}/${pkgname}-${version}.tgz" -checksum=c195449eb2d2299ca3c0a24788a9aab569fe41c2e0e83128b5c29ba96e5abb1b +checksum=11c9dd187d9ee53dfe9ebe4bc9e472928c3f3926328f266953b7178c0ad5b4f2 post_install() { vlicense COPYING diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index 12ac0b58862..b2452ffe52a 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,6 +1,6 @@ # Template file for 'warzone2100' pkgname=warzone2100 -version=4.5.3 +version=4.5.5 revision=1 build_style=cmake configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="http://wz2100.net" changelog="https://raw.githubusercontent.com/Warzone2100/warzone2100/master/ChangeLog" distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz" -checksum=eed49f2e456d87d9db192c27d6e356785ac7c7969cfa368edc693d05bfa12c89 +checksum=07f61bae721687edeb62da4877e85030a03a053a593d645194fc65778e0480ff nocross="fails to detect SDL2 when cross-compiling" post_extract() { diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template index 7978a26aa19..68860a99017 100644 --- a/srcpkgs/watchexec/template +++ b/srcpkgs/watchexec/template @@ -1,6 +1,6 @@ # Template file for 'watchexec' pkgname=watchexec -version=2.1.2 +version=2.2.0 revision=1 build_style=cargo make_install_args="--path crates/cli" @@ -11,7 +11,7 @@ license="Apache-2.0" homepage="https://github.com/watchexec/watchexec" changelog="https://github.com/watchexec/watchexec/releases" distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/v${version}.tar.gz" -checksum=500b886038ccd553559fe19914e1a502728cfeb8ee9d81f3db448b05e5a890ec +checksum=372def49d02a53864ede5fd821feb6f8de96bbbde8a94dbcd1b77aeed01d4a7b if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then XBPS_CROSS_RUSTFLAGS+=" -latomic" diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template index 81f1d8d94dc..21bd2e4806e 100644 --- a/srcpkgs/wayland-protocols/template +++ b/srcpkgs/wayland-protocols/template @@ -1,6 +1,6 @@ # Template file for 'wayland-protocols' pkgname=wayland-protocols -version=1.37 +version=1.38 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" @@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://wayland.freedesktop.org" distfiles="https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${version}/wayland-protocols-${version}.tar.gz" -checksum=c3b215084eb4cf318415533554c2c2714e58ed75847d7c3a8e50923215ffbbf3 +checksum=a6069948458a1d86cea2b33a9735e67d7524118c32c388d75efb881a9e9d2cd9 post_install() { vlicense COPYING diff --git a/srcpkgs/waylock/template b/srcpkgs/waylock/template index 05bc78acfa0..de1d55799f9 100644 --- a/srcpkgs/waylock/template +++ b/srcpkgs/waylock/template @@ -1,6 +1,6 @@ # Template file for 'waylock' pkgname=waylock -version=1.2.0 +version=1.3.0 revision=1 build_style=zig-build configure_args="-Dpie" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="ISC" homepage="https://codeberg.org/ifreund/waylock" distfiles="https://codeberg.org/ifreund/waylock/releases/download/v${version}/waylock-${version}.tar.gz" -checksum=343fbb043bea54f5fd93e9fdb3ef441e6bfada60e8bf754d840a20e985689582 +checksum=b7ec04c1dc0c6adb47045b4f604cb35988e9ca93bd4f3317fcc91bfac7bf075a post_install() { vlicense LICENSE diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template index 3f53e1dc3ac..d5eedbccafe 100644 --- a/srcpkgs/webhook/template +++ b/srcpkgs/webhook/template @@ -1,7 +1,7 @@ # Template file for 'webhook' pkgname=webhook -version=2.8.1 -revision=3 +version=2.8.2 +revision=1 build_style=go go_import_path="github.com/adnanh/webhook" short_desc="Lightweight incoming webhook server to run shell commands" @@ -9,7 +9,7 @@ maintainer="Abigail G " license="MIT" homepage="https://github.com/adnanh/webhook" distfiles="https://github.com/adnanh/webhook/archive/${version}.tar.gz" -checksum=a1e3eb2231e5631ebb374b76a79c3bac9cbdc7010974395e2d5e4e2e62ffd187 +checksum=c233a810effc24b5ed5653f4fa82152f288ec937d5744a339f7066a6cbccc565 conf_files="/etc/webhook/hooks.json /etc/sv/webhook/conf" system_accounts="_webhook" system_groups="_webhook" diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index 262310ea68f..820dc8aba11 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,6 +1,6 @@ # Template file for 'weechat' pkgname=weechat -version=4.4.2 +version=4.4.3 revision=1 build_style=cmake configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON @@ -18,7 +18,7 @@ license="GPL-3.0-or-later" homepage="https://www.weechat.org" changelog="https://raw.githubusercontent.com/weechat/weechat/master/CHANGELOG.md" distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz" -checksum=d4df289a9c5bca03a6d4fae006e52037064ef03bad6fbe959c538f3197434dec +checksum=295612f8dc24af28c918257d3014eb53342a5d077d5e3d9a3eadf303bd8febfa lib32disabled=yes subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl" diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template index 3222030eb8d..774498fced4 100644 --- a/srcpkgs/wego/template +++ b/srcpkgs/wego/template @@ -1,7 +1,7 @@ # Template file for 'wego' pkgname=wego -version=2.2 -revision=3 +version=2.3 +revision=1 build_style=go go_import_path=github.com/schachmat/wego short_desc="Weather client for the terminal" @@ -10,7 +10,7 @@ license="ISC" homepage="https://github.com/schachmat/wego" changelog="https://github.com/schachmat/wego/releases" distfiles="https://github.com/schachmat/wego/archive/refs/tags/${version}.tar.gz" -checksum=e7a6d40cb44f4408aedceebbed5854b3b992936cc762df6b76f5a9dca7909321 +checksum=6a7501ab537709d1d9fc04f14e5a2c5a8f99309591a8dae75260caf4a74ce567 post_install() { vlicense LICENSE diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 3738539e461..21a0c925cb0 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,9 +1,10 @@ # Template file for 'weston' pkgname=weston -version=13.0.3 +version=14.0.1 revision=1 build_style=meson -configure_args=" $(vopt_bool vaapi backend-drm-screencast-vaapi) " +# requires XDG_RUNTIME_DIR for most tests +configure_args="-Dtests=false $(vopt_bool vaapi backend-drm-screencast-vaapi) " hostmakedepends="pkg-config wayland-devel wayland-protocols" makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel @@ -17,7 +18,7 @@ maintainer="Daniel Martinez " license="MIT" homepage="https://wayland.freedesktop.org/" distfiles="https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz" -checksum=27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093 +checksum=a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3 lib32disabled=yes replaces="weston-colord>=0" @@ -33,10 +34,6 @@ case "$XBPS_TARGET_MACHINE" in ;; esac -pre_configure() { - vsed -i "/subdir('tests')/d" meson.build -} - post_install() { vlicense COPYING LICENSE vdoc "${FILESDIR}/README.voidlinux" diff --git a/srcpkgs/whowatch/template b/srcpkgs/whowatch/template index 4573650dd7a..71043c75a02 100644 --- a/srcpkgs/whowatch/template +++ b/srcpkgs/whowatch/template @@ -8,10 +8,10 @@ makedepends="ncurses-devel" short_desc="Displays information about the users currently logged on in real time" maintainer="Jan S. " license="GPL-2.0-or-later" -disable_parallel_build="yes" -homepage="http://wizard.ae.krakow.pl/~mike/#whowatch" +homepage="https://github.com/mtsuszycki/whowatch" distfiles="https://github.com/mtsuszycki/whowatch/archive/whowatch-${version}.tar.gz" checksum=1b8d54e3de4d8325c47a0fb8765cbaaeee8744359b5dacd4bdb3e40b4e31797e +disable_parallel_build="yes" pre_configure() { autoreconf -fi diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 3965569cd71..7f5dc3d6114 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=9.20 +version=9.21 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -13,8 +13,8 @@ license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="95f2b45b1458125be7d9fccc94ca5f8cce0a5e4ae11d0d193cfb7dddb35e7a86 - e88fe8e23f7160489538636a2d795772415004d48cdcc85d29dd9e59b2fe575d" +checksum="4442b47ffd9b2ea457100e36ed5fd4e6f4d829d9db79a25e605175a988ca2fff + 2e8c9cf9e378f99de133c7d86f9f0d5d506305869f4c802cb598f97b2f6bf8a6" # NOTE: wine depends on specific versions of wine-mono and wine-gecko, # check for updates to these packages when updating wine diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template index d85b6b931e6..380903c2edb 100644 --- a/srcpkgs/wireplumber/template +++ b/srcpkgs/wireplumber/template @@ -1,6 +1,6 @@ # Template file for 'wireplumber' pkgname=wireplumber -version=0.5.5 +version=0.5.6 revision=1 build_style=meson build_helper=gir @@ -14,7 +14,7 @@ license="MIT" homepage="https://pipewire.pages.freedesktop.org/wireplumber" changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst" distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz" -checksum=49075cd5c2f4820839a9e69d4a22386bc280c62b92c153af9be39ca439d45a09 +checksum=ce7b7217d880bed1438e408ea412716a259cb46b09f597bfd652a577dc60185c provides="pipewire-session-manager-0_1" post_install() { diff --git a/srcpkgs/wlroots0.15-devel b/srcpkgs/wlroots0.15-devel deleted file mode 120000 index 2e1ce6ccc62..00000000000 --- a/srcpkgs/wlroots0.15-devel +++ /dev/null @@ -1 +0,0 @@ -wlroots0.15 \ No newline at end of file diff --git a/srcpkgs/wlroots0.15/template b/srcpkgs/wlroots0.15/template deleted file mode 100644 index 18423a3e250..00000000000 --- a/srcpkgs/wlroots0.15/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'wlroots0.15' -pkgname=wlroots0.15 -version=0.15.1 -revision=3 -build_style=meson -# Follow upstream packaging recommendations: -# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations -configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false - -Db_ndebug=false" -hostmakedepends="pkg-config wayland-devel glslang" -_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel - libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols vulkan-loader-devel xcb-util-errors-devel - xcb-util-wm-devel xcb-util-renderutil-devel " -makedepends="${_devel_depends} - libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel - xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland" -short_desc="Modular Wayland compositor library" -maintainer="Orphaned " -license="MIT" -homepage="https://gitlab.freedesktop.org/wlroots/wlroots" -distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz" -checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373 - -post_install() { - vlicense LICENSE -} - -wlroots0.15-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" - provides="virtual-wlroots-devel-${version}_${revision}" - conflicts="wlroots0.14-devel virtual-wlroots-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/wlroots0.16-devel b/srcpkgs/wlroots0.16-devel deleted file mode 120000 index 8fe7760ebc0..00000000000 --- a/srcpkgs/wlroots0.16-devel +++ /dev/null @@ -1 +0,0 @@ -wlroots0.16 \ No newline at end of file diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template deleted file mode 100644 index 4a244665d7b..00000000000 --- a/srcpkgs/wlroots0.16/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'wlroots0.16' -pkgname=wlroots0.16 -version=0.16.2 -revision=3 -build_style=meson -# Follow upstream packaging recommendations: -# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations -configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false - -Db_ndebug=false" -hostmakedepends="pkg-config wayland-devel glslang hwids" -_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel - libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols vulkan-loader-devel xcb-util-errors-devel - xcb-util-wm-devel xcb-util-renderutil-devel " -makedepends="${_devel_depends} - libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel - xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland" -short_desc="Modular Wayland compositor library ${pkgname#wlroots}" -maintainer="Orphaned " -license="MIT" -homepage="https://gitlab.freedesktop.org/wlroots/wlroots" -distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz" -checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa - -post_install() { - vlicense LICENSE -} - -wlroots0.16-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" - provides="virtual-wlroots-devel-${version}_${revision}" - conflicts="wlroots0.15-devel wlroots0.14-devel virtual-wlroots-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/wmfs/template b/srcpkgs/wmfs/template index cf10d345e8a..1cc9221e266 100644 --- a/srcpkgs/wmfs/template +++ b/srcpkgs/wmfs/template @@ -11,7 +11,7 @@ short_desc="Window Manager From Scratch" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/xorg62/wmfs" -distfiles="https://github.com/downloads/xorg62/wmfs/wmfs-${version}.tar.gz" +distfiles="https://sources.voidlinux.org/wmfs-${version}/wmfs-${version}.tar.gz" checksum=c28b7cec28a6e3f2bc38a136fb1773bab8ec8f48c69ebe25c24192f96e782d64 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2 -fcommon" diff --git a/srcpkgs/wpa_gui/template b/srcpkgs/wpa_gui/template index 33d9df4623d..61d32fdc740 100644 --- a/srcpkgs/wpa_gui/template +++ b/srcpkgs/wpa_gui/template @@ -1,6 +1,6 @@ # Template file for 'wpa_gui' pkgname=wpa_gui -version=2.10 +version=2.11 revision=1 build_wrksrc="wpa_supplicant/wpa_gui-qt4" build_style=qmake @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://w1.fi/wpa_supplicant/" distfiles="https://w1.fi/releases/wpa_supplicant-${version}.tar.gz" -checksum=20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f +checksum=912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a do_install() { vbin wpa_gui diff --git a/srcpkgs/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config index 7a61cf87a76..743c68504c9 100644 --- a/srcpkgs/wpa_supplicant/files/config +++ b/srcpkgs/wpa_supplicant/files/config @@ -101,6 +101,9 @@ CONFIG_EAP_MSCHAPV2=y # EAP-TLS CONFIG_EAP_TLS=y +# Enable EAP-TLSv1.3 support by default (currently disabled unless explicitly +# enabled in network configuration) +CONFIG_EAP_TLSV1_3=y # EAL-PEAP CONFIG_EAP_PEAP=y @@ -203,9 +206,15 @@ CONFIG_SMARTCARD=y # Support VHT overrides (disable VHT, mask MCS rates, etc.) #CONFIG_VHT_OVERRIDES=y +# Support HE overrides +#CONFIG_HE_OVERRIDES=y + # Development testing #CONFIG_EAPOL_TEST=y +# Support IPv6 +CONFIG_IPV6=y + # Select control interface backend for external programs, e.g, wpa_cli: # unix = UNIX domain sockets (default for Linux/*BSD) # udp = UDP sockets using localhost (127.0.0.1) @@ -248,6 +257,9 @@ CONFIG_WPA_CLI_EDIT=y # Simultaneous Authentication of Equals (SAE), WPA3-Personal CONFIG_SAE=y +# SAE Public Key, WPA3-Personal +CONFIG_SAE_PK=y + # Disable scan result processing (ap_scan=1) to save code size by about 1 kB. # This can be used if ap_scan=1 mode is never enabled. #CONFIG_NO_SCAN_PROCESSING=y @@ -389,6 +401,22 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y # amount of memory/flash. #CONFIG_DYNAMIC_EAP_METHODS=y +# Dynamic library loading + +# Add the ability to configure libraries to load at compile time. +# If set, these disable dynamic configuration. +#CONFIG_PKCS11_ENGINE_PATH - pkcs11_engine library location. +#CONFIG_PKCS11_MODULE_PATH - pkcs11_module library location. +#CONFIG_OPENSC_ENGINE_PATH - opensc_engine library location. +# +# Prevent library loading at runtime +#CONFIG_NO_PKCS11_ENGINE_PATH=y # prevents loading pkcs11_engine library. +#CONFIG_NO_PKCS11_MODULE_PATH=y # prevents loading pkcs11_module library. +# CONFIG_NO_OPENSC_ENGINE_PATH=y # prevents loading opensc_engine library. + +# Prevents loading EAP libraries at runtime +#CONFIG_NO_LOAD_DYNAMIC_EAP=y + # IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode CONFIG_IEEE80211R=y @@ -474,6 +502,16 @@ CONFIG_GETRANDOM=y # IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) CONFIG_IEEE80211AC=y +# IEEE 802.11ax HE support (mainly for AP mode) +CONFIG_IEEE80211AX=y + +# IEEE 802.11be EHT support (mainly for AP mode) +# CONFIG_IEEE80211AX is mandatory for setting CONFIG_IEEE80211BE. +# Note: This is experimental and work in progress. The definitions are still +# subject to change and this should not be expected to interoperate with the +# final IEEE 802.11be version. +#CONFIG_IEEE80211BE=y + # Wireless Network Management (IEEE Std 802.11v-2011) # Note: This is experimental and not complete implementation. #CONFIG_WNM=y @@ -633,3 +671,18 @@ CONFIG_WEP=y # design is still subject to change. As such, this should not yet be enabled in # production use. #CONFIG_PASN=y + +# Disable support for Radio Measurement (IEEE 802.11k) and supported operating +# class indication. Removing these is not recommended since they can help the +# AP manage the network and STA steering. +#CONFIG_NO_RRM=y + +# Disable support for Robust AV streaming for consumer and enterprise Wi-Fi +# applications; IEEE Std 802.11-2020, 4.3.24; SCS, MSCS, QoS Management +#CONFIG_NO_ROBUST_AV=y + +# Disable support for WMM admission control +#CONFIG_NO_WMM_AC=y + +# Wi-Fi Aware unsynchronized service discovery (NAN USD) +#CONFIG_NAN_USD=y diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run index d96bac26d1a..29829f12cfa 100644 --- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run +++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run @@ -1,10 +1,10 @@ #!/bin/sh if [ -r ./conf ]; then . ./conf - : ${OPTS:=-M -c ${CONF_FILE:-/etc/wpa_supplicant/wpa_supplicant.conf} ${WPA_INTERFACE:+-i ${WPA_INTERFACE}} ${DRIVER:+-D ${DRIVER}} -s} + : ${OPTS:=-M -c ${CONF_FILE:-/etc/wpa_supplicant/wpa_supplicant.conf} ${WPA_INTERFACE:+-i ${WPA_INTERFACE}} ${DRIVER:+-D ${DRIVER}}} else . ./auto - OPTS="${AUTO} -s" + OPTS="${AUTO}" fi exec 2>&1 diff --git a/srcpkgs/wpa_supplicant/patches/4way-hand.patch b/srcpkgs/wpa_supplicant/patches/4way-hand.patch deleted file mode 100644 index d2baa8a839a..00000000000 --- a/srcpkgs/wpa_supplicant/patches/4way-hand.patch +++ /dev/null @@ -1,247 +0,0 @@ -From 023c17659786fe381312f154cf06663f1cb3607c Mon Sep 17 00:00:00 2001 -From: Ben Wolsieffer -Date: Tue, 23 Aug 2022 21:34:55 -0400 -Subject: [PATCH] Fix external passwords with 4-way handshake offloading - -Passphrases/PSKs from external password databases were ignored if 4-way -handshake offloading was supported by the driver. This patch splits the PSK -loading functionality into a separate function and calls if to get the PSK for -handshake offloading. - -I tested connecting to a WPA2-PSK network with both inline and external -passphrases, using the iwlwifi and brcmfmac drivers. - -Signed-off-by: Ben Wolsieffer ---- - wpa_supplicant/wpa_supplicant.c | 184 +++++++++++++++++--------------- - 1 file changed, 95 insertions(+), 89 deletions(-) - -diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c -index d37a994f9..bb063380f 100644 ---- a/wpa_supplicant/wpa_supplicant.c -+++ b/wpa_supplicant/wpa_supplicant.c -@@ -1337,6 +1337,88 @@ void wpas_set_mgmt_group_cipher(struct wpa_supplicant *wpa_s, - wpas_get_ssid_pmf(wpa_s, ssid)); - } - -+static int wpa_supplicant_get_psk(struct wpa_supplicant *wpa_s, -+ struct wpa_bss *bss, struct wpa_ssid *ssid, -+ u8 *psk) -+{ -+ if (ssid->psk_set) { -+ wpa_hexdump_key(MSG_MSGDUMP, "PSK (set in config)", ssid->psk, -+ PMK_LEN); -+ os_memcpy(psk, ssid->psk, PMK_LEN); -+ return 0; -+ } -+ -+#ifndef CONFIG_NO_PBKDF2 -+ if (bss && ssid->bssid_set && ssid->ssid_len == 0 && ssid->passphrase) { -+ pbkdf2_sha1(ssid->passphrase, bss->ssid, bss->ssid_len, 4096, -+ psk, PMK_LEN); -+ wpa_hexdump_key(MSG_MSGDUMP, "PSK (from passphrase)", psk, -+ PMK_LEN); -+ return 0; -+ } -+#endif /* CONFIG_NO_PBKDF2 */ -+ -+#ifdef CONFIG_EXT_PASSWORD -+ if (ssid->ext_psk) { -+ struct wpabuf *pw = ext_password_get(wpa_s->ext_pw, -+ ssid->ext_psk); -+ char pw_str[64 + 1]; -+ -+ if (pw == NULL) { -+ wpa_msg(wpa_s, MSG_INFO, "EXT PW: No PSK found from " -+ "external storage"); -+ return -1; -+ } -+ -+ if (wpabuf_len(pw) < 8 || wpabuf_len(pw) > 64) { -+ wpa_msg(wpa_s, MSG_INFO, "EXT PW: Unexpected PSK " -+ "length %d in external storage", -+ (int) wpabuf_len(pw)); -+ ext_password_free(pw); -+ return -1; -+ } -+ -+ os_memcpy(pw_str, wpabuf_head(pw), wpabuf_len(pw)); -+ pw_str[wpabuf_len(pw)] = '\0'; -+ -+#ifndef CONFIG_NO_PBKDF2 -+ if (wpabuf_len(pw) >= 8 && wpabuf_len(pw) < 64 && bss) -+ { -+ pbkdf2_sha1(pw_str, bss->ssid, bss->ssid_len, 4096, psk, -+ PMK_LEN); -+ os_memset(pw_str, 0, sizeof(pw_str)); -+ wpa_hexdump_key(MSG_MSGDUMP, "PSK (from external " -+ "passphrase)", -+ psk, PMK_LEN); -+ } else -+#endif /* CONFIG_NO_PBKDF2 */ -+ if (wpabuf_len(pw) == 2 * PMK_LEN) { -+ if (hexstr2bin(pw_str, psk, PMK_LEN) < 0) { -+ wpa_msg(wpa_s, MSG_INFO, "EXT PW: Invalid PSK " -+ "hex string"); -+ os_memset(pw_str, 0, sizeof(pw_str)); -+ ext_password_free(pw); -+ return -1; -+ } -+ wpa_hexdump_key(MSG_MSGDUMP, "PSK (from external PSK)", -+ psk, PMK_LEN); -+ } else { -+ wpa_msg(wpa_s, MSG_INFO, "EXT PW: No suitable PSK " -+ "available"); -+ os_memset(pw_str, 0, sizeof(pw_str)); -+ ext_password_free(pw); -+ return -1; -+ } -+ -+ os_memset(pw_str, 0, sizeof(pw_str)); -+ ext_password_free(pw); -+ -+ return 0; -+ } -+#endif /* CONFIG_EXT_PASSWORD */ -+ -+ return -1; -+} - - /** - * wpa_supplicant_set_suites - Set authentication and encryption parameters -@@ -1756,97 +1838,20 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, - WPA_KEY_MGMT_FT_PSK | - WPA_KEY_MGMT_PSK_SHA256)) == 0; - -- if (ssid->psk_set && !sae_only) { -- wpa_hexdump_key(MSG_MSGDUMP, "PSK (set in config)", -- ssid->psk, PMK_LEN); -- wpa_sm_set_pmk(wpa_s->wpa, ssid->psk, PMK_LEN, NULL, -- NULL); -- psk_set = 1; -- } -- -- if (wpa_key_mgmt_sae(ssid->key_mgmt) && -- (ssid->sae_password || ssid->passphrase)) -- psk_set = 1; -- --#ifndef CONFIG_NO_PBKDF2 -- if (bss && ssid->bssid_set && ssid->ssid_len == 0 && -- ssid->passphrase && !sae_only) { -+ if (!sae_only) { - u8 psk[PMK_LEN]; -- pbkdf2_sha1(ssid->passphrase, bss->ssid, bss->ssid_len, -- 4096, psk, PMK_LEN); -- wpa_hexdump_key(MSG_MSGDUMP, "PSK (from passphrase)", -- psk, PMK_LEN); -- wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN, NULL, NULL); -- psk_set = 1; -- os_memset(psk, 0, sizeof(psk)); -- } --#endif /* CONFIG_NO_PBKDF2 */ --#ifdef CONFIG_EXT_PASSWORD -- if (ssid->ext_psk && !sae_only) { -- struct wpabuf *pw = ext_password_get(wpa_s->ext_pw, -- ssid->ext_psk); -- char pw_str[64 + 1]; -- u8 psk[PMK_LEN]; -- -- if (pw == NULL) { -- wpa_msg(wpa_s, MSG_INFO, "EXT PW: No PSK " -- "found from external storage"); -- return -1; -- } -- -- if (wpabuf_len(pw) < 8 || wpabuf_len(pw) > 64) { -- wpa_msg(wpa_s, MSG_INFO, "EXT PW: Unexpected " -- "PSK length %d in external storage", -- (int) wpabuf_len(pw)); -- ext_password_free(pw); -- return -1; -- } -- -- os_memcpy(pw_str, wpabuf_head(pw), wpabuf_len(pw)); -- pw_str[wpabuf_len(pw)] = '\0'; -- --#ifndef CONFIG_NO_PBKDF2 -- if (wpabuf_len(pw) >= 8 && wpabuf_len(pw) < 64 && bss) -- { -- pbkdf2_sha1(pw_str, bss->ssid, bss->ssid_len, -- 4096, psk, PMK_LEN); -- os_memset(pw_str, 0, sizeof(pw_str)); -- wpa_hexdump_key(MSG_MSGDUMP, "PSK (from " -- "external passphrase)", -- psk, PMK_LEN); -- wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN, NULL, -- NULL); -- psk_set = 1; -- os_memset(psk, 0, sizeof(psk)); -- } else --#endif /* CONFIG_NO_PBKDF2 */ -- if (wpabuf_len(pw) == 2 * PMK_LEN) { -- if (hexstr2bin(pw_str, psk, PMK_LEN) < 0) { -- wpa_msg(wpa_s, MSG_INFO, "EXT PW: " -- "Invalid PSK hex string"); -- os_memset(pw_str, 0, sizeof(pw_str)); -- ext_password_free(pw); -- return -1; -- } -- wpa_hexdump_key(MSG_MSGDUMP, -- "PSK (from external PSK)", -- psk, PMK_LEN); -+ if (wpa_supplicant_get_psk(wpa_s, bss, ssid, -+ psk) >= 0) { - wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN, NULL, - NULL); - psk_set = 1; -- os_memset(psk, 0, sizeof(psk)); -- } else { -- wpa_msg(wpa_s, MSG_INFO, "EXT PW: No suitable " -- "PSK available"); -- os_memset(pw_str, 0, sizeof(pw_str)); -- ext_password_free(pw); -- return -1; - } -- -- os_memset(pw_str, 0, sizeof(pw_str)); -- ext_password_free(pw); -+ os_memset(psk, 0, sizeof(psk)); - } --#endif /* CONFIG_EXT_PASSWORD */ -+ -+ if (wpa_key_mgmt_sae(ssid->key_mgmt) && -+ (ssid->sae_password || ssid->passphrase)) -+ psk_set = 1; - - if (!psk_set) { - wpa_msg(wpa_s, MSG_INFO, -@@ -3606,6 +3611,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit) - int use_crypt, ret, bssid_changed; - unsigned int cipher_pairwise, cipher_group, cipher_group_mgmt; - struct wpa_driver_associate_params params; -+ u8 psk[PMK_LEN]; - #if defined(CONFIG_WEP) || defined(IEEE8021X_EAPOL) - int wep_keys_set = 0; - #endif /* CONFIG_WEP || IEEE8021X_EAPOL */ -@@ -3890,8 +3896,8 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit) - (params.key_mgmt_suite == WPA_KEY_MGMT_PSK || - params.key_mgmt_suite == WPA_KEY_MGMT_FT_PSK)) { - params.passphrase = ssid->passphrase; -- if (ssid->psk_set) -- params.psk = ssid->psk; -+ if (wpa_supplicant_get_psk(wpa_s, bss, ssid, psk) >= 0) -+ params.psk = psk; - } - - if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) && -@@ -3915,8 +3921,8 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit) - if ((params.key_mgmt_suite == WPA_KEY_MGMT_PSK || - params.key_mgmt_suite == WPA_KEY_MGMT_PSK_SHA256 || - params.key_mgmt_suite == WPA_KEY_MGMT_FT_PSK) && -- ssid->psk_set) -- params.psk = ssid->psk; -+ wpa_supplicant_get_psk(wpa_s, bss, ssid, psk) >= 0) -+ params.psk = psk; - } - - params.drop_unencrypted = use_crypt; diff --git a/srcpkgs/wpa_supplicant/patches/SAE_external_database.patch b/srcpkgs/wpa_supplicant/patches/SAE_external_database.patch deleted file mode 100644 index b3ed31f58eb..00000000000 --- a/srcpkgs/wpa_supplicant/patches/SAE_external_database.patch +++ /dev/null @@ -1,182 +0,0 @@ -From bdc35acd5abae45bd53e3117bfc673fc0e1ab0b9 Mon Sep 17 00:00:00 2001 -From: Ben Wolsieffer -Date: Sat, 17 Sep 2022 00:21:02 -0400 -Subject: SAE: Allow loading of the password from an external database - -There was no support for loading SAE passwords from an external password -database. - -Signed-off-by: Ben Wolsieffer ---- - wpa_supplicant/sme.c | 65 ++++++++++++++++++++++++++++++++--------- - wpa_supplicant/wpa_supplicant.c | 2 +- - 2 files changed, 53 insertions(+), 14 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 52861c805..28ac03f23 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -10,6 +10,7 @@ - - #include "common.h" - #include "utils/eloop.h" -+#include "utils/ext_password.h" - #include "common/ieee802_11_defs.h" - #include "common/ieee802_11_common.h" - #include "common/ocv.h" -@@ -90,7 +91,7 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s, - { - struct wpabuf *buf; - size_t len; -- const char *password; -+ char *password = NULL; - struct wpa_bss *bss; - int use_pt = 0; - bool use_pk = false; -@@ -106,7 +107,7 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s, - wpa_printf(MSG_DEBUG, "SAE: TESTING - commit override"); - buf = wpabuf_alloc(4 + wpabuf_len(wpa_s->sae_commit_override)); - if (!buf) -- return NULL; -+ goto fail; - if (!external) { - wpabuf_put_le16(buf, 1); /* Transaction seq# */ - wpabuf_put_le16(buf, WLAN_STATUS_SUCCESS); -@@ -116,12 +117,45 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s, - } - #endif /* CONFIG_TESTING_OPTIONS */ - -- password = ssid->sae_password; -- if (!password) -- password = ssid->passphrase; -+ if (ssid->sae_password) { -+ password = os_strdup(ssid->sae_password); -+ if (!password) { -+ wpa_dbg(wpa_s, MSG_INFO, -+ "SAE: Failed to allocate password"); -+ goto fail; -+ } -+ } -+ if (!password && ssid->passphrase) { -+ password = os_strdup(ssid->passphrase); -+ if (!password) { -+ wpa_dbg(wpa_s, MSG_INFO, -+ "SAE: Failed to allocate password"); -+ goto fail; -+ } -+ } -+ if (!password && ssid->ext_psk) { -+ struct wpabuf *pw = ext_password_get(wpa_s->ext_pw, -+ ssid->ext_psk); -+ -+ if (!pw) { -+ wpa_msg(wpa_s, MSG_INFO, -+ "SAE: No password found from external storage"); -+ goto fail; -+ } -+ -+ password = os_malloc(wpabuf_len(pw) + 1); -+ if (!password) { -+ wpa_dbg(wpa_s, MSG_INFO, -+ "SAE: Failed to allocate password"); -+ goto fail; -+ } -+ os_memcpy(password, wpabuf_head(pw), wpabuf_len(pw)); -+ password[wpabuf_len(pw)] = '\0'; -+ ext_password_free(pw); -+ } - if (!password) { - wpa_printf(MSG_DEBUG, "SAE: No password available"); -- return NULL; -+ goto fail; - } - - if (reuse && wpa_s->sme.sae.tmp && -@@ -134,7 +168,7 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s, - } - if (sme_set_sae_group(wpa_s) < 0) { - wpa_printf(MSG_DEBUG, "SAE: Failed to select group"); -- return NULL; -+ goto fail; - } - - bss = wpa_bss_get_bssid_latest(wpa_s, bssid); -@@ -171,7 +205,7 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s, - if (ssid->sae_pk == SAE_PK_MODE_ONLY && !use_pk) { - wpa_printf(MSG_DEBUG, - "SAE: Cannot use PK with the selected AP"); -- return NULL; -+ goto fail; - } - #endif /* CONFIG_SAE_PK */ - -@@ -184,7 +218,7 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s, - !use_pt) { - wpa_printf(MSG_DEBUG, - "SAE: Cannot use H2E with the selected AP"); -- return NULL; -+ goto fail; - } - } - -@@ -192,13 +226,13 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s, - sae_prepare_commit_pt(&wpa_s->sme.sae, ssid->pt, - wpa_s->own_addr, bssid, - wpa_s->sme.sae_rejected_groups, NULL) < 0) -- return NULL; -+ goto fail; - if (!use_pt && - sae_prepare_commit(wpa_s->own_addr, bssid, - (u8 *) password, os_strlen(password), - &wpa_s->sme.sae) < 0) { - wpa_printf(MSG_DEBUG, "SAE: Could not pick PWE"); -- return NULL; -+ goto fail; - } - if (wpa_s->sme.sae.tmp) { - os_memcpy(wpa_s->sme.sae.tmp->bssid, bssid, ETH_ALEN); -@@ -218,7 +252,7 @@ reuse_data: - len += 4 + os_strlen(ssid->sae_password_id); - buf = wpabuf_alloc(4 + SAE_COMMIT_MAX_LEN + len); - if (buf == NULL) -- return NULL; -+ goto fail; - if (!external) { - wpabuf_put_le16(buf, 1); /* Transaction seq# */ - if (use_pk) -@@ -231,14 +265,19 @@ reuse_data: - if (sae_write_commit(&wpa_s->sme.sae, buf, wpa_s->sme.sae_token, - ssid->sae_password_id) < 0) { - wpabuf_free(buf); -- return NULL; -+ goto fail; - } - if (ret_use_pt) - *ret_use_pt = use_pt; - if (ret_use_pk) - *ret_use_pk = use_pk; - -+ str_clear_free(password); - return buf; -+ -+fail: -+ str_clear_free(password); -+ return NULL; - } - - -diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c -index 54c3c859e..ef5d0cd71 100644 ---- a/wpa_supplicant/wpa_supplicant.c -+++ b/wpa_supplicant/wpa_supplicant.c -@@ -1998,7 +1998,7 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, - } - - if (wpa_key_mgmt_sae(ssid->key_mgmt) && -- (ssid->sae_password || ssid->passphrase)) -+ (ssid->sae_password || ssid->passphrase || ssid->ext_psk)) - psk_set = 1; - - if (!psk_set) { --- -cgit v1.2.3-18-g5258 diff --git a/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch b/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch new file mode 100644 index 00000000000..b42cba1088d --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch @@ -0,0 +1,50 @@ +From 2514856652f9a393e505d542cb8f039f8bac10f5 Mon Sep 17 00:00:00 2001 +From: Janne Grunau +Date: Sun, 4 Aug 2024 13:24:42 +0200 +Subject: [PATCH 1/1] Revert "Mark authorization completed on driver indication + during 4-way HS offload" + +This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5. +--- + wpa_supplicant/events.c | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c +index 46e7cf1ab..7b3ef7205 100644 +--- a/wpa_supplicant/events.c ++++ b/wpa_supplicant/events.c +@@ -4441,23 +4441,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s, + eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) && + wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) { +- if (already_authorized) { +- /* +- * We are done; the driver will take care of RSN 4-way +- * handshake. +- */ +- wpa_supplicant_cancel_auth_timeout(wpa_s); +- wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); +- eapol_sm_notify_portValid(wpa_s->eapol, true); +- eapol_sm_notify_eap_success(wpa_s->eapol, true); +- } else { +- /* Update port, WPA_COMPLETED state from the +- * EVENT_PORT_AUTHORIZED handler when the driver is done +- * with the 4-way handshake. +- */ +- wpa_msg(wpa_s, MSG_DEBUG, +- "ASSOC INFO: wait for driver port authorized indication"); +- } ++ /* ++ * We are done; the driver will take care of RSN 4-way ++ * handshake. ++ */ ++ wpa_supplicant_cancel_auth_timeout(wpa_s); ++ wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); ++ eapol_sm_notify_portValid(wpa_s->eapol, true); ++ eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) && + wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) { + /* +-- +2.45.2 + diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 63a34632059..5294519d3a9 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,17 +1,16 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant -version=2.10 -revision=5 -build_wrksrc="$pkgname" +version=2.11 +revision=1 +build_wrksrc="${pkgname}" +hostmakedepends="pkg-config" +makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)" short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Enno Boland " license="BSD-3-Clause" homepage="http://w1.fi/wpa_supplicant/" distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz" -checksum=20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f - -hostmakedepends="pkg-config" -makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)" +checksum=912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a build_options="dbus readline" build_options_default="dbus readline" conf_files="/etc/${pkgname}/${pkgname}.conf" @@ -31,10 +30,12 @@ pre_build() { vsed -i -e 's|#\{0,1\}\(CONFIG_READLINE\)=\(.*\)|\1=y|' .config fi } + do_build() { export CFLAGS+=" $(pkg-config --cflags libnl-3.0) $CPPFLAGS" make ${makejobs} V=1 PREFIX=/usr BINDIR=/usr/bin } + do_install() { make PREFIX=/usr BINDIR=/usr/bin DESTDIR=${DESTDIR} install diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template index 0de93f79902..b2482241022 100644 --- a/srcpkgs/wps-office/template +++ b/srcpkgs/wps-office/template @@ -1,6 +1,6 @@ # Template file for 'wps-office' pkgname=wps-office -version=11.1.0.11719 +version=11.1.0.11723 revision=1 archs="x86_64" short_desc="Linux office suite with similar appearance to MS Office" @@ -12,7 +12,7 @@ maintainer="mobinmob " license="custom:EULA" homepage="https://www.wps.com/" changelog="https://www.wps.com/whatsnew/linux/" -checksum=6edabcffae920384179c46876f69837263c8d4bc46aab1abcc58ddbd17565e53 +checksum=db81e5244ae435e31fa2aa833c3ce3b667b4a3b0aa3b7bd948ebdd7fb736f2da allow_unknown_shlibs=yes nodebug=yes nostrip=yes diff --git a/srcpkgs/wstunnel/template b/srcpkgs/wstunnel/template index 3256b6fbd5f..c17042fe41c 100644 --- a/srcpkgs/wstunnel/template +++ b/srcpkgs/wstunnel/template @@ -1,6 +1,6 @@ # Template file for 'wstunnel' pkgname=wstunnel -version=10.1.0 +version=10.1.6 revision=1 build_style=cargo make_check_args="-- --skip protocols::tcp::server::tests::test_proxy_connection" # test requires docker @@ -10,7 +10,7 @@ license="BSD-3-Clause" homepage="https://github.com/erebe/wstunnel" changelog="https://github.com/erebe/wstunnel/releases" distfiles="https://github.com/erebe/wstunnel/archive/refs/tags/v${version}.tar.gz" -checksum=44da14d6fa7bd5d168b0563f5a6447f0a18956da9ff1692a1409def068fda87b +checksum=c89b0fe2d7848233304e622c7ad744954ed4b287edbec48d8e2d65a2569dbd3e make_check=ci-skip # remaining tests require port binding which can't be done in CI post_install() { diff --git a/srcpkgs/x13s-base/files/95-libcamera-hack.rules b/srcpkgs/x13s-base/files/95-libcamera-hack.rules new file mode 100644 index 00000000000..c63695849db --- /dev/null +++ b/srcpkgs/x13s-base/files/95-libcamera-hack.rules @@ -0,0 +1,2 @@ +ACTION=="add", SUBSYSTEM=="dma_heap", KERNEL=="linux,cma", GROUP="video", MODE="0660", TAG+="uaccess" +ACTION=="add", SUBSYSTEM=="dma_heap", KERNEL=="system", GROUP="video", MODE="0660", TAG+="uaccess" diff --git a/srcpkgs/x13s-base/template b/srcpkgs/x13s-base/template index 17da5ee388c..28872d58fab 100644 --- a/srcpkgs/x13s-base/template +++ b/srcpkgs/x13s-base/template @@ -1,6 +1,6 @@ # Template file for 'x13s-base' pkgname=x13s-base -version=1 +version=2 revision=1 archs="aarch64*" depends="linux-mainline>=6.8 linux-firmware-qualcomm alsa-ucm-conf" @@ -13,6 +13,7 @@ conf_files="/etc/default/x13s" do_install() { vinstall "${FILESDIR}"/72-touchscreen.rules 644 usr/lib/udev/rules.d 72-x13s-touchscreen.rules vinstall "${FILESDIR}"/90-net-address.rules 644 usr/lib/udev/rules.d 90-x13s-net-address.rules + vinstall "${FILESDIR}"/95-libcamera-hack.rules 644 usr/lib/udev/rules.d 95-x13s-libcamera-hack.rules vinstall "${FILESDIR}"/90-bt-address.sh 644 etc/runit/core-services 90-x13s-bt-address.sh vinstall "${FILESDIR}"/dracut.conf 644 usr/lib/dracut/dracut.conf.d x13s.conf vinstall "${FILESDIR}"/x13s-setup 755 usr/libexec diff --git a/srcpkgs/xaos/template b/srcpkgs/xaos/template index 4f946946f97..a34987361ab 100644 --- a/srcpkgs/xaos/template +++ b/srcpkgs/xaos/template @@ -1,6 +1,6 @@ # Template file for 'xaos' pkgname=xaos -version=4.3.2 +version=4.3.3 revision=1 build_style=qmake hostmakedepends="qt6-base qt6-tools" @@ -10,4 +10,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://xaos-project.github.io/" distfiles="https://github.com/xaos-project/XaoS/archive/release-${version}.tar.gz" -checksum=1fc08f282ffb6decb7aeadc344d47be77871f9734dc8f57cc13df857291d74ec +checksum=ea286d7dc057ee4f9158829758321767e82e48f5bb374c6e4fc1483f296852eb diff --git a/srcpkgs/xcompmgr/template b/srcpkgs/xcompmgr/template index c485c7e82e4..e44989213a0 100644 --- a/srcpkgs/xcompmgr/template +++ b/srcpkgs/xcompmgr/template @@ -1,6 +1,6 @@ # Template file for 'xcompmgr' pkgname=xcompmgr -version=1.1.9 +version=1.1.10 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="HPND" homepage="https://www.x.org/wiki/" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" -checksum=4875b6698672d01eb3a5080bde6eac9a989d486a82226a2d5e23624f1527a6f0 +checksum=7824f709c4f22432eaea7542ec93384e5dd48f6fcb85c12ff82d721423b0b98f post_install() { vlicense COPYING diff --git a/srcpkgs/xdg-desktop-portal-lxqt/template b/srcpkgs/xdg-desktop-portal-lxqt/template index df4a1163025..11056168458 100644 --- a/srcpkgs/xdg-desktop-portal-lxqt/template +++ b/srcpkgs/xdg-desktop-portal-lxqt/template @@ -1,7 +1,7 @@ # Template file for 'xdg-desktop-portal-lxqt' pkgname=xdg-desktop-portal-lxqt -version=1.0.2 -revision=2 +version=1.1.0 +revision=1 build_style=cmake hostmakedepends="qt6-base qt6-tools" makedepends="kf6-kwindowsystem-devel libfm-qt-devel qt6-base-private-devel" @@ -11,4 +11,4 @@ license="LGPL-2.1-or-later" homepage="https://github.com/lxqt/xdg-desktop-portal-lxqt" changelog="https://github.com/lxqt/xdg-desktop-portal-lxqt/raw/master/CHANGELOG" distfiles="https://github.com/lxqt/xdg-desktop-portal-lxqt/archive/${version}.tar.gz" -checksum=3f13151deb515ce9f17431bd48dfbea717499c698d28267cd225b47ac22a6d6c +checksum=daec0b701e3027bc69b8cc612f3f4b898b7e1e2b98c2d503915e71b8e1617dd9 diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template index 81934e22805..887978200fb 100644 --- a/srcpkgs/xf86-input-wacom/template +++ b/srcpkgs/xf86-input-wacom/template @@ -1,6 +1,6 @@ # Template file for 'xf86-input-wacom' pkgname=xf86-input-wacom -version=1.2.2 +version=1.2.3 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="classabbyamp " license="GPL-2.0-only" homepage="https://github.com/linuxwacom/xf86-input-wacom" distfiles="https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-${version}/xf86-input-wacom-${version}.tar.bz2" -checksum=70771033543097e6c616a39ae8bb40fd0e991a25560ed10c65b33756c3061511 +checksum=70365826c3ca58cc81d98fab8f048f2c375e78c786111eb8a72a67a5721cb146 lib32disabled=yes xf86-input-wacom-devel_package() { diff --git a/srcpkgs/xlogo/template b/srcpkgs/xlogo/template index 6703c28b5fc..032c6205006 100644 --- a/srcpkgs/xlogo/template +++ b/srcpkgs/xlogo/template @@ -1,6 +1,6 @@ # Template file for 'xlogo' pkgname=xlogo -version=1.0.6 +version=1.0.7 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://www.x.org/archive/X11R6.8.1/doc/xlogo.1.html" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" -checksum=c16ae461a7f7ea275f55c82acf3ee86ce0eb5e406f3a91ab2bb4d332693f32a0 +checksum=8a3f67b20407a53286a7de1a04dbda12d272234d59ef35e68ecfaf7633d83624 post_install() { vlicense COPYING diff --git a/srcpkgs/xlunch/INSTALL b/srcpkgs/xlunch/INSTALL deleted file mode 100644 index 62025c9d583..00000000000 --- a/srcpkgs/xlunch/INSTALL +++ /dev/null @@ -1,33 +0,0 @@ -# This file is originally called 'genconf' in the src, but it needs to -# run on the machine that this actually gets installed on, so it will -# be an install script here... - -case "$ACTION" in - post) - mkdir -p etc/xlunch - APPS=/usr/share/applications - ICONS=/usr/share/icons/hicolor - SIZE=48 - - echo "generating config file from $APPS ..." >&2 - - - find $APPS | fgrep .desktop | while read DESKTOPFILE; do - NAME="$(cat $DESKTOPFILE | egrep -i "^Name=" | head -n 1 | cut -d "=" -f 2-)" - EXEC="$(cat $DESKTOPFILE | egrep -i "^Exec=" | head -n 1 | cut -d "=" -f 2-)" - ICON="$(cat $DESKTOPFILE | egrep -i "^Icon=" | head -n 1 | cut -d "=" -f 2-)" - TERM="$(cat $DESKTOPFILE | egrep -i "^Terminal=" | head -n 1 | cut -d "=" -f 2-)" - - if [ "$TERM" = "true" ]; then - EXEC="xterm -e ""$EXEC" - fi - - if [ "$ICON" != "" ]; then - ICON=$(find "$ICONS" | grep $SIZE"x"$SIZE | grep $ICON"[.]png" | head -n 1) - if [ "$ICON" != "" -a "$EXEC" != "" -a "$NAME" != "" ]; then - echo "$NAME;$ICON;$EXEC" - fi - fi - done | sort | uniq > etc/xlunch/entries.dsv - ;; -esac diff --git a/srcpkgs/xlunch/patches/build.patch b/srcpkgs/xlunch/patches/build.patch new file mode 100644 index 00000000000..a75fb12ebb0 --- /dev/null +++ b/srcpkgs/xlunch/patches/build.patch @@ -0,0 +1,39 @@ +diff --git a/Makefile b/Makefile +index 8297904..88a1c51 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,9 +1,9 @@ + CC = gcc +-LDFLAGS = -lImlib2 -lX11 ++override LDFLAGS += -lImlib2 -lX11 + CFLAGS ?= -O2 -s + #CFLAGS ?= -ggdb -g3 # For debugging + +-all: xlunch entries.dsv ++all: xlunch # entries.dsv + + install: xlunch + mkdir -p $(DESTDIR)/etc/xlunch/ +@@ -20,7 +20,7 @@ install: xlunch + cp extra/genentries.desktop.sh $(DESTDIR)/usr/bin + cp extra/genentries.desktop $(DESTDIR)/usr/share/applications/ + cp default.conf $(DESTDIR)/etc/xlunch/default.conf +- bash extra/genentries --path $(DESTDIR)/usr/share/xlunch/svgicons/ > $(DESTDIR)/etc/xlunch/entries.dsv ++ # bash extra/genentries --path $(DESTDIR)/usr/share/xlunch/svgicons/ > $(DESTDIR)/etc/xlunch/entries.dsv + cp -r svgicons/ $(DESTDIR)/usr/share/xlunch/ 2>/dev/null || : + + remove: +diff --git a/xlunch.c b/xlunch.c +index e613d37..50eed83 100644 +--- a/xlunch.c ++++ b/xlunch.c +@@ -39,6 +39,9 @@ const int VERSION_PATCH = 5; // Patch version, changes when something is changed + #include + #include + ++/* file I/O stuff */ ++#include ++ + /* some globals for our window & X display */ + Display *disp; + Window win; diff --git a/srcpkgs/xlunch/patches/ldflags.patch b/srcpkgs/xlunch/patches/ldflags.patch deleted file mode 100644 index 2d547fae6d6..00000000000 --- a/srcpkgs/xlunch/patches/ldflags.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/Makefile 2017-05-16 00:48:25.302317545 -0500 -+++ b/Makefile 2017-05-16 00:47:47.801022135 -0500 -@@ -1,5 +1,5 @@ - CC = gcc --LDFLAGS = -lImlib2 -lX11 -+override LDFLAGS += -lImlib2 -lX11 - CFLAGS ?= -O2 -s - - all: xlunch icons.conf diff --git a/srcpkgs/xlunch/patches/musl.patch b/srcpkgs/xlunch/patches/musl.patch deleted file mode 100644 index cd76c29116e..00000000000 --- a/srcpkgs/xlunch/patches/musl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/xlunch.c 2017-05-17 21:38:59.048445309 -0500 -+++ b/xlunch.c 2017-05-17 21:39:41.334944291 -0500 -@@ -27,6 +27,9 @@ - #include - #include - -+/* file I/O stuff */ -+#include -+ - /* some globals for our window & X display */ - Display *disp; - Window win; diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template index c3e9ed018c4..084d0a2eeac 100644 --- a/srcpkgs/xlunch/template +++ b/srcpkgs/xlunch/template @@ -1,25 +1,14 @@ # Template file for 'xlunch' pkgname=xlunch -version=4.7.3 +version=4.7.5 revision=1 build_style=gnu-makefile make_build_target=xlunch makedepends="imlib2-devel" +depends="bash findutils grep awk sed desktop-file-utils hicolor-icon-theme" short_desc="Graphical app launcher for X with little dependencies" maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="http://xlunch.org/" distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz" -checksum=9bc03634e8889f47d5727a8f3f49462cebc2c3576337593ffd9832801ea63e6c - -do_install() { - vbin xlunch - vbin extra/genentries - - vmkdir usr/share/icons/hicolor/48x48/apps - vinstall extra/ghost.png 0644 usr/share/icons/hicolor/48x48/apps - vinstall docs/logo.png 0644 usr/share/icons/hicolor/48x48/apps - - vmkdir usr/share/applications - vinstall extra/genentries.desktop 0644 usr/share/applications -} +checksum=594b2f79e0c789b5206b45c41ffd5c16e3b5a96754725286956e39b10261b725 diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template index c0761abdc91..2649c95a3a2 100644 --- a/srcpkgs/xml2rfc/template +++ b/srcpkgs/xml2rfc/template @@ -1,6 +1,6 @@ # Template file for 'xml2rfc' pkgname=xml2rfc -version=3.23.2 +version=3.24.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://ietf-tools.github.io/xml2rfc/" distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz" -checksum=3744efe53bc8a6c56ac3ed89f5c6b36b9a3158efb58dc2a0cdc118a1b5a6dec6 +checksum=db04c29ab45ef66e3ad780d2c68acfe0364e0de78d06932dfc9938e4286f422f make_check=no # too many dependencies post_install() { diff --git a/srcpkgs/xone/patches/linux6.11.patch b/srcpkgs/xone/patches/linux6.11.patch new file mode 100644 index 00000000000..bf881ab395c --- /dev/null +++ b/srcpkgs/xone/patches/linux6.11.patch @@ -0,0 +1,26 @@ +From 28df566c38e0ee500fd5f74643fc35f21a4ff696 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torleif=20Sk=C3=A5r?= + <16509259+tskaar@users.noreply.github.com> +Date: Tue, 30 Jul 2024 22:35:25 +0200 +Subject: [PATCH] fix: build on kernel v6.11 + +--- + bus/bus.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/bus/bus.c b/bus/bus.c +index 4a6c64f..8dc9bbb 100644 +--- a/bus/bus.c ++++ b/bus/bus.c +@@ -56,7 +56,11 @@ static struct device_type gip_client_type = { + .release = gip_client_release, + }; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0) + static int gip_bus_match(struct device *dev, struct device_driver *driver) ++#else ++static int gip_bus_match(struct device *dev, const struct device_driver *driver) ++#endif + { + struct gip_client *client; + struct gip_driver *drv; diff --git a/srcpkgs/xone/patches/linux6.12.patch b/srcpkgs/xone/patches/linux6.12.patch new file mode 100644 index 00000000000..ee7175a9bb0 --- /dev/null +++ b/srcpkgs/xone/patches/linux6.12.patch @@ -0,0 +1,74 @@ +From d88ea1e8b430d4b96134e43ca1892ac48334578e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torleif=20Sk=C3=A5r?= + <16509259+tskaar@users.noreply.github.com> +Date: Mon, 30 Sep 2024 21:07:13 +0200 +Subject: [PATCH] fix: build on kernel v6.12 + +Upstream "Drop of obsoloted vmalloc PCM buffer helper API"; +https://lore.kernel.org/all/20240807152725.18948-3-tiwai@suse.de/ + +Code taken from the driver; +https://lore.kernel.org/all/20240807152725.18948-2-tiwai@suse.de/ +--- + driver/headset.c | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) + +diff --git a/driver/headset.c b/driver/headset.c +index ebee92d..c736351 100644 +--- a/driver/headset.c ++++ b/driver/headset.c +@@ -5,6 +5,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -90,13 +91,34 @@ static int gip_headset_pcm_close(struct snd_pcm_substream *sub) + static int gip_headset_pcm_hw_params(struct snd_pcm_substream *sub, + struct snd_pcm_hw_params *params) + { +- return snd_pcm_lib_alloc_vmalloc_buffer(sub, +- params_buffer_bytes(params)); ++ struct snd_pcm_runtime *runtime = sub->runtime; ++ size_t size = params_buffer_bytes(params); ++ ++ if (runtime->dma_area) { ++ if (runtime->dma_bytes >= size) ++ return 0; /* Already large enough */ ++ vfree(runtime->dma_area); ++ } ++ runtime->dma_area = vzalloc(size); ++ if (!runtime->dma_area) ++ return -ENOMEM; ++ runtime->dma_bytes = size; ++ return 1; + } + + static int gip_headset_pcm_hw_free(struct snd_pcm_substream *sub) + { +- return snd_pcm_lib_free_vmalloc_buffer(sub); ++ struct snd_pcm_runtime *runtime = sub->runtime; ++ ++ vfree(runtime->dma_area); ++ runtime->dma_area = NULL; ++ return 0; ++} ++ ++static struct page *gip_headset_pcm_get_page(struct snd_pcm_substream *sub, ++ unsigned long offset) ++{ ++ return vmalloc_to_page(sub->runtime->dma_area + offset); + } + + static int gip_headset_pcm_prepare(struct snd_pcm_substream *sub) +@@ -157,7 +179,7 @@ static const struct snd_pcm_ops gip_headset_pcm_ops = { + .prepare = gip_headset_pcm_prepare, + .trigger = gip_headset_pcm_trigger, + .pointer = gip_headset_pcm_pointer, +- .page = snd_pcm_lib_get_vmalloc_page, ++ .page = gip_headset_pcm_get_page, + }; + + static bool gip_headset_advance_pointer(struct gip_headset_stream *stream, diff --git a/srcpkgs/xone/patches/linux6.8.patch b/srcpkgs/xone/patches/linux6.8.patch new file mode 100644 index 00000000000..d84568c7ea2 --- /dev/null +++ b/srcpkgs/xone/patches/linux6.8.patch @@ -0,0 +1,33 @@ +From 1b4344ab8d9d7891f843dc993b0c5447f46c9889 Mon Sep 17 00:00:00 2001 +From: medusalix +Date: Sun, 21 Jan 2024 21:18:17 +0100 +Subject: [PATCH] Fix build on kernel 6.8 + +--- + transport/dongle.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/transport/dongle.c b/transport/dongle.c +index 1a30922..71aed1c 100644 +--- a/transport/dongle.c ++++ b/transport/dongle.c +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1024,7 +1025,11 @@ static struct usb_driver xone_dongle_driver = { + .suspend = xone_dongle_suspend, + .resume = xone_dongle_resume, + .id_table = xone_dongle_id_table, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) + .drvwrap.driver.shutdown = xone_dongle_shutdown, ++#else ++ .driver.shutdown = xone_dongle_shutdown, ++#endif + .supports_autosuspend = true, + .disable_hub_initiated_lpm = true, + .soft_unbind = true, diff --git a/srcpkgs/xone/template b/srcpkgs/xone/template index 6068eba9792..1ecf927f62d 100644 --- a/srcpkgs/xone/template +++ b/srcpkgs/xone/template @@ -1,7 +1,7 @@ # Template file for 'xone' pkgname=xone version=0.3 -revision=2 +revision=3 depends="curl cabextract dkms" short_desc="Modern Linux driver for Xbox One and Xbox Series X|S controllers" maintainer="Orphaned " diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template index 10b42ecf0d3..118c37c3a18 100644 --- a/srcpkgs/xonsh/template +++ b/srcpkgs/xonsh/template @@ -1,18 +1,18 @@ # Template file for 'xonsh' pkgname=xonsh -version=0.17.0 +version=0.18.4 revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel" -depends="python3" +depends="python3 python3-Pygments" checkdepends="python3-pytest python3-prompt_toolkit python3-Pygments python3-pyte" short_desc="Python-powered, cross-platform, Unix-gazing shell" maintainer="SolitudeSF " license="GPL-3.0-or-later" homepage="https://xon.sh/" changelog="https://raw.githubusercontent.com/xonsh/xonsh/master/CHANGELOG.rst" -distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz" -checksum=7a7ad21eb6831ed09e2949cd65282f6e84c7406179f031706d8a41eeb6919a81 +distfiles="https://github.com/xonsh/xonsh/archive/refs/tags/${version}.tar.gz" +checksum=0e583cd64c0e17bc8ffd16701264622569c4e6c770ee7d769884d1957729a564 register_shell="/bin/xonsh" # FIXME: AttributeError because of missing XSH.load() and multiple other failures make_check=no diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 739bbf40f04..372242fafb6 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,6 +1,6 @@ # Template file for 'xorg-server' pkgname=xorg-server -version=21.1.13 +version=21.1.14 revision=1 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true @@ -22,9 +22,9 @@ checkdepends="xkeyboard-config" short_desc="X11 server from X.org" maintainer="Leah Neukirchen " license="MIT, BSD-3-Clause" -homepage="https://xorg.freedesktop.org" +homepage="https://gitlab.freedesktop.org/xorg/xserver" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz" -checksum=b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c +checksum=8f2102cebdc4747d1656c1099ef610f5063c7422c24a177e300de569b354ee35 lib32disabled=yes provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-25_1 xf86-video-modesetting-1_1" diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template index 5204f527a9c..5211227a441 100644 --- a/srcpkgs/xorg-util-macros/template +++ b/srcpkgs/xorg-util-macros/template @@ -1,6 +1,6 @@ # Template file for 'xorg-util-macros' pkgname=xorg-util-macros -version=1.20.1 +version=1.20.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://gitlab.freedesktop.org/xorg/util/macros/" distfiles="${XORG_SITE}/util/util-macros-${version}.tar.xz" -checksum=0b308f62dce78ac0f4d9de6888234bf170f276b64ac7c96e99779bb4319bcef5 +checksum=9ac269eba24f672d7d7b3574e4be5f333d13f04a7712303b1821b2a51ac82e8e post_install() { vlicense COPYING diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 2e4c9c9c3a9..ba7447ea317 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,6 +1,6 @@ # Template file for 'xpra' pkgname=xpra -version=6.1.3 +version=6.2.1 revision=1 build_style=python3-module make_build_args="--without-cuda_kernels --without-cuda_rebuild @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://xpra.org/" changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md" distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz" -checksum=6a995e4539597730df9bec1d10abaec7bdb5d834494121430fb436c418c32f49 +checksum=3b3642053f06bdc76308fd5d3b6f1a8b4797fa3995bb832b0a714a310cea1571 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*" # Tests don't run properly without package installed make_check=no diff --git a/srcpkgs/xprop/template b/srcpkgs/xprop/template index 3da61a4cd35..cf440657ea1 100644 --- a/srcpkgs/xprop/template +++ b/srcpkgs/xprop/template @@ -1,6 +1,6 @@ # Template file for 'xprop' pkgname=xprop -version=1.2.7 +version=1.2.8 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://gitlab.freedesktop.org/xorg/app/xprop" distfiles="${XORG_SITE}/app/xprop-${version}.tar.xz" -checksum=4436e3148bb91a162406230d9f736a49ca8b50b74790015dc15d78d6ce8e825f +checksum=d689e2adb7ef7b439f6469b51cda8a7daefc83243854c2a3b8f84d0f029d67ee post_install() { vlicense COPYING diff --git a/srcpkgs/xq/INSTALL.msg b/srcpkgs/xq/INSTALL.msg new file mode 100644 index 00000000000..f1346eae4da --- /dev/null +++ b/srcpkgs/xq/INSTALL.msg @@ -0,0 +1,2 @@ +Due to conflicting binary names, the `xq` binary is renamed to `xq-go` +by default. diff --git a/srcpkgs/xq/template b/srcpkgs/xq/template index d8a0bf349be..bd2edf9c29f 100644 --- a/srcpkgs/xq/template +++ b/srcpkgs/xq/template @@ -1,7 +1,7 @@ # Template file for 'xq' pkgname=xq -version=1.2.4 -revision=2 +version=1.2.5 +revision=1 build_style=go go_import_path=github.com/sibprogrammer/xq make_check_args="-covermode=atomic" @@ -10,7 +10,7 @@ maintainer="Emil Miler " license="MIT" homepage="https://github.com/sibprogrammer/xq" distfiles="https://github.com/sibprogrammer/xq/archive/refs/tags/v${version}.tar.gz" -checksum=5044de231d2426c236618e52d3d2e59cd45b008e55d5dfa8df97c3269c64354d +checksum=9432a992d2f0ab82a7350da6317e27f835713c340177518dd08581bd0e918365 post_install() { mv "$DESTDIR/usr/bin/"{xq,xq-go} diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template index dc585750006..02d22fa4a1a 100644 --- a/srcpkgs/xrefresh/template +++ b/srcpkgs/xrefresh/template @@ -1,7 +1,7 @@ # Template file for 'xrefresh' pkgname=xrefresh -version=1.0.7 -revision=2 +version=1.1.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MIT" homepage="https://gitlab.freedesktop.org/xorg/app/xrefresh" distfiles="${XORG_SITE}/app/xrefresh-${version}.tar.gz" -checksum=f2817920f119bd9146ed3cde223b8a4ab17cb72da4ece7bddde35e18b31aa337 +checksum=cbf0d3ed80f03188841a96ceb20e615b40a006e3928be2e179d9d5a0ded639b2 post_install() { vlicense COPYING diff --git a/srcpkgs/xstarter/template b/srcpkgs/xstarter/template index 4363d36e3c3..9e632fb23e9 100644 --- a/srcpkgs/xstarter/template +++ b/srcpkgs/xstarter/template @@ -8,7 +8,7 @@ makedepends="glib-devel ncurses-devel" short_desc="Application launcher for Linux" maintainer="Orphaned " license="GPL-3.0-or-later" -homepage="https://xstarter.org" +homepage="https://github.com/lchsk/xstarter" changelog="https://raw.githubusercontent.com/lchsk/xstarter/master/CHANGELOG" distfiles="https://github.com/lchsk/xstarter/archive/v${version}.tar.gz" checksum=cb82bf837a2693cbbad468812d517256e079d6aae56dde770d473b245603030a diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template index bfa8e31ad7b..4463f49a187 100644 --- a/srcpkgs/xterm/template +++ b/srcpkgs/xterm/template @@ -1,6 +1,6 @@ # Template file for 'xterm' pkgname=xterm -version=394 +version=395 revision=1 build_style=gnu-configure configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc @@ -20,7 +20,7 @@ license="MIT, X11" homepage="https://invisible-island.net/xterm/" changelog="https://invisible-island.net/xterm/xterm.log.html" distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz" -checksum=a2a0cb206eb0423dedc34794f5c2d38c83390d2dd1106b66aba0960c3a976c7a +checksum=286e3caa5938eae38e202827621567629dfeaae689e8070b413ca11398093dc8 CFLAGS="-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700" diff --git a/srcpkgs/xtruss/template b/srcpkgs/xtruss/template index 950f2e71790..62d4da3ce39 100644 --- a/srcpkgs/xtruss/template +++ b/srcpkgs/xtruss/template @@ -1,15 +1,15 @@ # Template file for 'xtruss' pkgname=xtruss -version=20211025.c25bf48 +version=20241111.27fafff revision=1 build_style=cmake hostmakedepends="halibut" short_desc="Easy-to-use X protocol tracing program" maintainer="Leah Neukirchen " license="MIT" -homepage="http://www.chiark.greenend.org.uk/~sgtatham/xtruss/" -distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=8a4b8a1ed5c49f65152c4eb697ba83f6a73d65493a8e202a8f9aeedfabe07479 +homepage="https://www.chiark.greenend.org.uk/~sgtatham/xtruss/" +distfiles="https://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=76c56863d066b991f3c5a42b3a8dd65e76b18609214d7405a14572f40d7195ed CFLAGS="-UNDEBUG" diff --git a/srcpkgs/xwallpaper/template b/srcpkgs/xwallpaper/template index 628f43ff521..0ac7b8eaf72 100644 --- a/srcpkgs/xwallpaper/template +++ b/srcpkgs/xwallpaper/template @@ -1,6 +1,6 @@ # Template file for 'xwallpaper' pkgname=xwallpaper -version=0.7.4 +version=0.7.5 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="ISC" homepage="https://github.com/stoeckmann/xwallpaper" distfiles="https://github.com/stoeckmann/xwallpaper/archive/v${version}.tar.gz" -checksum=1f7b0b2162221065b63f2498bc9a8d7a53d59ac893ab32e527bb02f031015084 +checksum=d64b8bae1700835d1c0996b28ff0e9d4a93ead4f8698bbdb6acc19150537aa23 pre_configure() { autoreconf -fiv diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template index 72c380492b3..bd430d1b9a7 100644 --- a/srcpkgs/xz/template +++ b/srcpkgs/xz/template @@ -8,7 +8,7 @@ configure_args="--disable-doc" short_desc="XZ compression utilities" maintainer="Enno Boland " license="Public Domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" -homepage="https://xz.tukaani.org" +homepage="https://tukaani.org/xz/" changelog="https://github.com/tukaani-project/xz/raw/master/NEWS" distfiles="https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.gz" checksum=8bfd20c0e1d86f0402f2497cfa71c6ab62d4cd35fd704276e3140bfb71414519 diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template index 4e0c9118112..183b7400cf1 100644 --- a/srcpkgs/yabasic/template +++ b/srcpkgs/yabasic/template @@ -1,7 +1,7 @@ # Template file for 'yabasic' pkgname=yabasic reverts="2.769_1" -version=2.90.2 +version=2.90.4 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="MIT" homepage="https://2484.de/yabasic/" distfiles="https://2484.de/yabasic/download/yabasic-${version}.tar.gz" -checksum=7dfe63d1c2758b61d622c623c33c79145b597dc856b06445d8066d6c35eb349c +checksum=b5de78482d4b9cedf3d3b9b706c543a6202c9a8933078c67e1d6d575f7981fc3 do_install() { vbin yabasic diff --git a/srcpkgs/yamlfmt/template b/srcpkgs/yamlfmt/template index 03cfb535051..2dbdd33d66e 100644 --- a/srcpkgs/yamlfmt/template +++ b/srcpkgs/yamlfmt/template @@ -1,7 +1,7 @@ # Template file for 'yamlfmt' pkgname=yamlfmt -version=0.13.0 -revision=2 +version=0.14.0 +revision=1 build_style=go go_import_path="github.com/google/yamlfmt" go_package="github.com/google/yamlfmt/cmd/yamlfmt" @@ -10,4 +10,4 @@ maintainer="Bnyro " license="Apache-2.0" homepage="https://github.com/google/yamlfmt" distfiles="https://github.com/google/yamlfmt/archive/refs/tags/v${version}.tar.gz" -checksum=79117ece08bd4175a88a1ec9fed703a10d1573750fe73c6e212d9c62b96e2369 +checksum=351fe18bd821fa3ce3cda48f4f2270bf0b39104ca5dec5d99bd6c84841eb9bcb diff --git a/srcpkgs/yaydl/patches/cargo-lock.patch b/srcpkgs/yaydl/patches/cargo-lock.patch deleted file mode 100644 index 1a0011a556c..00000000000 --- a/srcpkgs/yaydl/patches/cargo-lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock 2024-09-16 10:47:59.500660845 +0200 -+++ b/Cargo.lock 2024-09-16 10:49:17.816085825 +0200 -@@ -1923,7 +1923,7 @@ - - [[package]] - name = "yaydl" --version = "0.16.0" -+version = "0.15.5" - dependencies = [ - "anyhow", - "cienli", diff --git a/srcpkgs/yaydl/template b/srcpkgs/yaydl/template index 264453d4af1..0a60b8c1ce1 100644 --- a/srcpkgs/yaydl/template +++ b/srcpkgs/yaydl/template @@ -1,6 +1,6 @@ # Template file for 'yaydl' pkgname=yaydl -version=0.15.5 +version=0.16.0 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ license="GPL-3.0-or-later" homepage="https://code.rosaelefanten.org/yaydl/index" changelog="https://github.com/dertuxmalwieder/yaydl/tags" distfiles="https://github.com/dertuxmalwieder/yaydl/archive/refs/tags/release-${version}.tar.gz" -checksum=c30af51ec5ede5343e636b0dc457af824bc01fd34d8854561d6fae4a210d3eff +checksum=e60bee00ce373b874a0ba11006c9a703e69e5e8a2ec798e14610fbf6cf0f60a9 diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template index 827f6d77357..678ca41b59b 100644 --- a/srcpkgs/yggdrasil/template +++ b/srcpkgs/yggdrasil/template @@ -1,6 +1,6 @@ # Template file for 'yggdrasil' pkgname=yggdrasil -version=0.5.8 +version=0.5.9 revision=1 build_style=go go_import_path=github.com/yggdrasil-network/yggdrasil-go @@ -13,7 +13,7 @@ license="LGPL-3.0-only" homepage="https://yggdrasil-network.github.io/" changelog="https://raw.githubusercontent.com/yggdrasil-network/yggdrasil-go/develop/CHANGELOG.md" distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz" -checksum=34845eff314d971e56c12186ef15ce52efdf78d787d17381ea4cefaf4b853df3 +checksum=ed7e310292234dd871aa0f02e5e131b876a675ebad43a1785e986b0eaa8069dc post_install() { vsv yggdrasil diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template index 6e029f052ca..910e93feeb7 100644 --- a/srcpkgs/yt-dlp/template +++ b/srcpkgs/yt-dlp/template @@ -1,6 +1,6 @@ # Template file for 'yt-dlp' pkgname=yt-dlp -version=2024.10.07 +version=2024.11.04 revision=1 build_style=python3-pep517 make_check_args="-k not((download)or(test_socks))" @@ -13,4 +13,4 @@ license="Unlicense" homepage="https://github.com/yt-dlp/yt-dlp" changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md" distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/${version}/yt-dlp.tar.gz>yt-dlp-$version.tar.gz" -checksum=8435749b6159104f06b31952d3edc2f90f2c72b0d2927fb899333621d58ca7a2 +checksum=0ae3767c48d90d7fd6c5cb5a3d9fcb954441d984abf20c077d5f5bc0789b9aa4 diff --git a/srcpkgs/zellij/patches/fix-underline-colors.patch b/srcpkgs/zellij/patches/fix-underline-colors.patch deleted file mode 100644 index 31b5d8f31fe..00000000000 --- a/srcpkgs/zellij/patches/fix-underline-colors.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 475dd0862312c9f7a6b0e913400e3372aa09c591 Mon Sep 17 00:00:00 2001 -From: tranzystorekk -Date: Fri, 21 Jun 2024 13:46:17 +0200 -Subject: [PATCH] fix(terminal): use ITU T.418 format for emitted CSI 58 - sequences (#3440) - ---- - zellij-server/src/panes/terminal_character.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/zellij-server/src/panes/terminal_character.rs b/zellij-server/src/panes/terminal_character.rs -index c3e6b19df9..3bdc6559fd 100644 ---- a/zellij-server/src/panes/terminal_character.rs -+++ b/zellij-server/src/panes/terminal_character.rs -@@ -619,10 +619,10 @@ impl Display for CharacterStyles { - if let Some(ansi_code) = self.underline_color { - match ansi_code { - AnsiCode::RgbCode((r, g, b)) => { -- write!(f, "\u{1b}[58;2;{};{};{}m", r, g, b)?; -+ write!(f, "\u{1b}[58:2::{}:{}:{}m", r, g, b)?; - }, - AnsiCode::ColorIndex(color_index) => { -- write!(f, "\u{1b}[58;5;{}m", color_index)?; -+ write!(f, "\u{1b}[58:5:{}m", color_index)?; - }, - AnsiCode::Reset => { - write!(f, "\u{1b}[59m")?; diff --git a/srcpkgs/zellij/patches/use-system-libcurl.patch b/srcpkgs/zellij/patches/use-system-libcurl.patch new file mode 100644 index 00000000000..615978879b8 --- /dev/null +++ b/srcpkgs/zellij/patches/use-system-libcurl.patch @@ -0,0 +1,13 @@ +diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml +index a5aca05..9e77f09 100644 +--- a/zellij-utils/Cargo.toml ++++ b/zellij-utils/Cargo.toml +@@ -57,7 +57,7 @@ notify-debouncer-full = "0.1.0" + humantime = "2.1.0" + futures = "0.3.28" + openssl-sys = { version = "0.9.93", features = ["vendored"] } +-isahc = "1.7.2" ++isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] } + curl-sys = { version = "0.4", features = ["force-system-lib-on-osx"] } + + [dev-dependencies] diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index 4cccb374076..b0150e87551 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,15 +1,14 @@ # Template file for 'zellij' pkgname=zellij -version=0.40.1 -revision=2 -# Wasmer runtime only supports the following archs: x86_64, arm64 -# https://docs.wasmer.io/runtime/features#backend-support-by-chipset -# https://github.com/wasmerio/wasmer/issues/4244#issuecomment-1751365804 +version=0.41.1 +revision=1 +# Wasmtime runtime only supports the following archs: x86_64, arm64 +# https://docs.wasmtime.dev/stability-tiers.html#unsupported-features-and-platforms archs="x86_64* aarch64*" build_style=cargo build_helper=qemu hostmakedepends="mandown pkg-config" -makedepends="libcurl-devel" +makedepends="libcurl-devel libzstd-devel" checkdepends="libssh2-devel" short_desc="Terminal workspace with batteries included" maintainer="tranzystorekk " @@ -17,7 +16,7 @@ license="MIT" homepage="https://zellij.dev" changelog="https://raw.githubusercontent.com/zellij-org/zellij/main/CHANGELOG.md" distfiles="https://github.com/zellij-org/zellij/archive/refs/tags/v${version}.tar.gz" -checksum=1f0bfa13f2dbe657d76341a196f98a3b4caa47ac63abee06b39883a11ca220a8 +checksum=72db7eb7257db08f338f37f0294791ea815140f739fbcb7059ccb0c8165a99d3 make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1" post_install() { diff --git a/srcpkgs/zf/template b/srcpkgs/zf/template index d750b0ec78a..841fccdc643 100644 --- a/srcpkgs/zf/template +++ b/srcpkgs/zf/template @@ -1,6 +1,6 @@ # Template file for 'zf' pkgname=zf -version=0.10.0 +version=0.10.2 revision=1 build_style=zig-build configure_args="-Dpie" @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/natecraddock/zf" changelog="https://raw.githubusercontent.com/natecraddock/zf/refs/heads/main/CHANGELOG.md" distfiles="https://github.com/natecraddock/zf/archive/refs/tags/${version}.tar.gz" -checksum=a90b2fff1d552910897487d177eaf92176e421f097ad61c70b8f8b127deef160 +checksum=b8e41f942c7033536fd64f9edea467a7ff4f45d52885d585f0adafb7803ac0ed post_install() { vlicense LICENSE diff --git a/srcpkgs/zfsbootmenu/patches/dracut-config.patch b/srcpkgs/zfsbootmenu/patches/dracut-config.patch new file mode 100644 index 00000000000..a0a15cf5abf --- /dev/null +++ b/srcpkgs/zfsbootmenu/patches/dracut-config.patch @@ -0,0 +1,7 @@ +--- a/etc/zfsbootmenu/dracut.conf.d/zfsbootmenu.conf ++++ b/etc/zfsbootmenu/dracut.conf.d/zfsbootmenu.conf +@@ -1,3 +1,3 @@ + nofsck="yes" +-add_dracutmodules+=" zfsbootmenu " ++add_dracutmodules+=" zfsbootmenu bash " + omit_dracutmodules+=" btrfs zfs resume systemd systemd-initrd dracut-systemd plymouth dash " diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template index 85483ff201c..a6ba5c09deb 100644 --- a/srcpkgs/zfsbootmenu/template +++ b/srcpkgs/zfsbootmenu/template @@ -1,7 +1,7 @@ # Template file for 'zfsbootmenu' pkgname=zfsbootmenu version=2.3.0 -revision=2 +revision=3 build_style=gnu-makefile make_build_target="zbm-release" depends="dracut zfs kexec-tools fzf bash pigz mbuffer ncurses