From 4fd95545f1d0947d13c3d7c16494eaf7c5a98959 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 16 Mar 2023 06:32:36 +0100 Subject: [PATCH 01/29] New package: gum-0.9.0 --- srcpkgs/gum/template | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/gum/template diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template new file mode 100644 index 000000000000..89c48e9287eb --- /dev/null +++ b/srcpkgs/gum/template @@ -0,0 +1,28 @@ +# Template file for 'gum' +pkgname=gum +version=0.9.0 +revision=1 +build_style=go +build_helper=qemu +go_import_path="github.com/charmbracelet/gum" +go_ldflags="-X main.Version=v${version}" +short_desc="Tool for glamorous shell scripts" +maintainer="zenobit " +license="MIT" +homepage="https://github.com/charmbracelet/gum" +changelog="https://github.com/charmbracelet/gum/releases" +distfiles="https://github.com/charmbracelet/gum/archive/refs/tags/v${version}.tar.gz" +checksum=27dab5c8ca25e09794d54d7610064bea37a4e0c471d4e0a8a6835727a27a9a0f + +post_install() { + vlicense LICENSE + + _cli=${DESTDIR}/usr/bin/gum + for shell in bash fish zsh; do + vtargetrun $_cli completion $shell > gum.${shell} + vcompletion gum.${shell} $shell + done + + vtargetrun $_cli man > gum.1 + vman gum.1 +} From 8f3863f8514d32a1660a349d6590cdfb0faf80c7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 1 Mar 2023 11:12:36 -0500 Subject: [PATCH 02/29] openjdk11: remove useless nostrep from -static-libs it wasn't doing anything anyways, it was "notstrip" also fix distfile source, update check --- srcpkgs/openjdk11/template | 5 ++--- srcpkgs/openjdk11/update | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 173aac14b5d5..e0d7ba7fb632 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -36,8 +36,8 @@ short_desc="OpenJDK Java Development Kit (version ${_java_ver})" maintainer="Kyle Nusbaum " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" -distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" -checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a +distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" +checksum=9a37c9641b45f5c51fe19c1ccae141daeb5dcdbd59fa2f56e7dea7bf09484bec provides="java-environment-${version}_1" # Build is still parallel, but don't use -jN. @@ -212,7 +212,6 @@ openjdk11-src_package() { } openjdk11-static-libs_package() { - notstrip=yes short_desc+=" - static libs" pkg_install() { vmkdir $_jdk_home diff --git a/srcpkgs/openjdk11/update b/srcpkgs/openjdk11/update index a4ed7b4e4ea8..fbdc9a1ba62f 100644 --- a/srcpkgs/openjdk11/update +++ b/srcpkgs/openjdk11/update @@ -1,2 +1 @@ -site="http://hg.openjdk.java.net/jdk-updates/jdk11u/tags" -pattern='jdk-\K11\.[\d.+]+' +pattern='jdk-\K11\.[\d.+]+(?=\.)' From c072e3c778b6ec654254efbdf8e329e54c0981e2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 1 Mar 2023 11:13:09 -0500 Subject: [PATCH 03/29] openjdk17: static libs subpackage --- srcpkgs/openjdk17-static-libs | 1 + srcpkgs/openjdk17/template | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/openjdk17-static-libs diff --git a/srcpkgs/openjdk17-static-libs b/srcpkgs/openjdk17-static-libs new file mode 120000 index 000000000000..99ab1cb1b0d2 --- /dev/null +++ b/srcpkgs/openjdk17-static-libs @@ -0,0 +1 @@ +openjdk17 \ No newline at end of file diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index e4b6a8a3b5bb..40e1e42d72fe 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,7 +1,7 @@ # Template file for 'openjdk17' pkgname=openjdk17 version=17.0.5+7 -revision=1 +revision=2 _gtest_ver=1.8.1 _java_ver="${version%%.*}" _jdk_update="${version#*+}" @@ -30,7 +30,7 @@ configure_args="--disable-warnings-as-errors --with-vendor-url=https://voidlinux.org/ --with-vendor-bug-url=https://github.com/void-linux/void-packages/issues --with-vendor-vm-bug-url=https://github.com/void-linux/void-packages/issues" -make_build_args="images $(vopt_if docs docs)" +make_build_args="images static-libs-image $(vopt_if docs docs)" make_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\"" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates @@ -159,6 +159,7 @@ do_configure() { post_install() { rm -rf ${DESTDIR}/usr/lib/bin mv ${DESTDIR}/usr/lib/jvm/openjdk-${_base_version} ${DESTDIR}/$_jdk_home + vcopy build/*-release/images/static-libs/lib $_jdk_home vmkdir $_jdk_home/lib/security make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/$_jdk_home/bin/keytool" mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/$_jdk_home/lib/security/ @@ -166,7 +167,7 @@ post_install() { rm -rf ./ca } -subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods" +subpackages="openjdk17-static-libs openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods" openjdk17-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" @@ -219,6 +220,13 @@ openjdk17-src_package() { } } +openjdk17-static-libs_package() { + short_desc+=" - static libs" + pkg_install() { + vmove "$_jdk_home/lib/*.a" + } +} + openjdk17-jmods_package() { short_desc+=" - JMODs" depends="${pkgname}-${version}_${revision}" From fefad4274e274b52210771dd8b164295d04749bd Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 21 Dec 2022 21:01:10 +0530 Subject: [PATCH 04/29] mandrel: update to 22.3.1.0. --- srcpkgs/mandrel/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template index a0b0701df206..503d264c2394 100644 --- a/srcpkgs/mandrel/template +++ b/srcpkgs/mandrel/template @@ -1,11 +1,10 @@ # Template file for 'mandrel' pkgname=mandrel -version=22.1.0.0 +version=22.3.1.0 revision=1 -_java_ver=11 -_mx_ver=6.1.2 +_java_ver=17 +_mx_ver=6.16.0 archs="aarch64* x86_64*" # upstream supported archs -create_wrksrc=yes hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3" makedepends="zlib-devel" @@ -16,9 +15,9 @@ 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="a93ef67c75c52ff90faba95236100c4f702df2de87593b9bb00da3a2cbec3a23 - 8cf3aefe5f9aa7869ddaf02376be5febc20831461ce524c912f3f22fbf922863 - ae7a7d2a195666e32126f51dad5b55abbc204a13e89582172cc461a29ae84205" +checksum="dd37f4a8f628b8909228f489e12363427df9d0f95d1afedad39a2443b22a806d + bfe15128e8ffb5fd108ee20477e5ee1572c63405d6d0b93d905185356128dcec + aeec921e0669c72575dd9af54b5d5413d744dac590c82db46ae2bf60c4dfeb1b" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" nocross=yes @@ -32,6 +31,7 @@ post_patch() { do_build() { cd mandrel-packaging-* + export PATH=/usr/libexec/chroot-git:$PATH export JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver} $JAVA_HOME/bin/java -ea build.java \ --mx-home $PWD/../mx-* \ From 28f5f0a6553fc450a05b0cf35416484ea3999965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 9 Mar 2023 17:40:11 +0700 Subject: [PATCH 05/29] python3-sphinxcontrib-applehelp: update to 1.0.4. --- srcpkgs/python3-sphinxcontrib-applehelp/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-sphinxcontrib-applehelp/template b/srcpkgs/python3-sphinxcontrib-applehelp/template index f77be44613d8..92cb1866c421 100644 --- a/srcpkgs/python3-sphinxcontrib-applehelp/template +++ b/srcpkgs/python3-sphinxcontrib-applehelp/template @@ -1,17 +1,18 @@ # Template file for 'python3-sphinxcontrib-applehelp' pkgname=python3-sphinxcontrib-applehelp -version=1.0.2 -revision=4 -build_style=python3-module -hostmakedepends="python3-setuptools" +version=1.0.4 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core python3-pyproject-hooks python3-setuptools + python3-wheel" depends="python3" -checkdepends="python3-Sphinx" short_desc="Sphinx extension which outputs Apple help book" maintainer="Đoàn Trần Công Danh " license="BSD-2-Clause" homepage="http://sphinx-doc.org" distfiles="${PYPI_SITE}/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-${version}.tar.gz" -checksum=a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58 +checksum=828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e +make_check=no # cyclic with Sphinx post_install() { vlicense LICENSE From 06a52f48ea3bad0fcb37a731e7eb583be7d1e688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 9 Mar 2023 17:40:15 +0700 Subject: [PATCH 06/29] python3-sphinxcontrib-htmlhelp: update to 2.0.1. --- srcpkgs/python3-sphinxcontrib-htmlhelp/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-sphinxcontrib-htmlhelp/template b/srcpkgs/python3-sphinxcontrib-htmlhelp/template index 8cb6241a7040..cb1a67770aaa 100644 --- a/srcpkgs/python3-sphinxcontrib-htmlhelp/template +++ b/srcpkgs/python3-sphinxcontrib-htmlhelp/template @@ -1,16 +1,17 @@ # Template file for 'python3-sphinxcontrib-htmlhelp' pkgname=python3-sphinxcontrib-htmlhelp -version=2.0.0 -revision=3 -build_style=python3-module -hostmakedepends="python3-setuptools" +version=2.0.1 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core python3-pyproject-hooks python3-setuptools + python3-wheel" depends="python3" short_desc="Sphinx extension which outputs HTML document" maintainer="Đoàn Trần Công Danh " license="BSD-2-Clause" homepage="http://sphinx-doc.org" distfiles="${PYPI_SITE}/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-${version}.tar.gz" -checksum=f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2 +checksum=0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff make_check=no # cyclic with Sphinx post_install() { From 69b5f80df02e9efbb74841bb7111a4649993b2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 9 Mar 2023 17:40:19 +0700 Subject: [PATCH 07/29] python3-Sphinx: update to 6.1.3. --- srcpkgs/python3-Sphinx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template index 7ff72dc54f3f..0ed92f2cb353 100644 --- a/srcpkgs/python3-Sphinx/template +++ b/srcpkgs/python3-Sphinx/template @@ -1,6 +1,6 @@ # Template file for 'python3-Sphinx' pkgname=python3-Sphinx -version=6.1.0 +version=6.1.3 revision=1 build_style=python3-pep517 make_install_target="dist/sphinx-$version-py3-none-any.whl" @@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause" homepage="http://sphinx-doc.org" distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz" -checksum=b0fd0a1993733492572bbd429b5ec081e17c082b5b5168ffae50524c3a90fd3c +checksum=0dac3b698538ffef41716cf97ba26c1c7788dba73ce6f150c1ff5b4720786dd2 conflicts="python-Sphinx>=0" post_install() { From 82ef9970329853833fcb97cae8415fca3b615abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 9 Mar 2023 17:40:31 +0700 Subject: [PATCH 08/29] cmake: update to 3.25.3. --- srcpkgs/cmake/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index e6f7bd28b76f..63fe4b9eccbf 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.25.2 +version=3.25.3 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake @@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c +checksum=cc995701d590ca6debc4245e9989939099ca52827dd46b5d3592f093afe1901c replaces="cmake-bootstrap>=0" if [ "$XBPS_TARGET_LIBC" = musl ]; then @@ -45,8 +45,7 @@ pre_configure() { do_check() { cd build - # https://gitlab.kitware.com/cmake/cmake/-/issues/23885 - ./bin/ctest -E RunCMake.SymlinkTrees + ./bin/ctest } post_install() { From 1667f088b15a8263c68450ec08e912a2d3a6c0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 9 Mar 2023 17:40:38 +0700 Subject: [PATCH 09/29] cmake-gui: update to 3.25.3. --- srcpkgs/cmake-gui/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index acfa45fe87cd..7f4584e552c4 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,6 +1,6 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.25.2 +version=3.25.3 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake @@ -10,18 +10,17 @@ hostmakedepends="qt6-base python3-Sphinx qt6-tools" makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel ncurses-devel qt6-base-devel rhash-devel qt6-tools-devel" depends="desktop-file-utils shared-mime-info cmake>=${version}" -checkdepends="pax pkg-config" +checkdepends="pax pkg-config git" short_desc="Cross-platform, open-source build system - Qt GUI" maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c +checksum=cc995701d590ca6debc4245e9989939099ca52827dd46b5d3592f093afe1901c do_check() { cd build - # https://gitlab.kitware.com/cmake/cmake/-/issues/23885 - ctest -E RunCMake.SymlinkTrees + ./bin/ctest } do_install() { From 51006da42b3bf7f01c299db61a26f8f184e64434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 16 Mar 2023 14:12:49 +0700 Subject: [PATCH 10/29] dropbox: limits arch to x86 dropbox only provides binaries for those arch, without those binaries, it's not functional --- srcpkgs/dropbox/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template index 150cb3c5dfd2..f03251ce86fa 100644 --- a/srcpkgs/dropbox/template +++ b/srcpkgs/dropbox/template @@ -2,6 +2,7 @@ pkgname=dropbox version=2023.02.27+cf4ccaa revision=1 +archs="x86_64 i686" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config automake libtool python3-gobject python3-docutils From 660b48d62e554f8949e48ac04e97325041ebd8e9 Mon Sep 17 00:00:00 2001 From: anelki Date: Wed, 15 Mar 2023 16:39:11 -0500 Subject: [PATCH 11/29] Signal-Desktop: update to 6.10.0. --- srcpkgs/Signal-Desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 669f15c78126..aea0bc0fa9cd 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,6 +1,6 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop -version=6.9.0 +version=6.10.0 revision=1 # Signal officially only supports x86_64 # x86_64-musl fails because of its dependency on 'node-gyp' which depends on a glibc specific extension @@ -13,7 +13,7 @@ maintainer="akierig " 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=5cf68e2e33c86d1dc53bf9f9c510c2d7871061eecb59d10d6968d46315560185 +checksum=aec9001aa11f3a96807b67678996796b43140d0b51cf58db0a6aa011c72e5a28 nostrip_files="signal-desktop" post_extract() { From 2c6f09813eadaea28689f7cdb4cef567aa75d917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 16 Mar 2023 06:04:54 +0100 Subject: [PATCH 12/29] exiftool: update to 12.58. --- srcpkgs/exiftool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 01ee65daa9f3..84d562b3b028 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=12.57 +version=12.58 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=923833ecd300a033f19a1ec857acb46b6710fda3236c7049e38e8f1e0afe6a57 +checksum=6b4a1ae778844739c2a3a0a03bb0988b42cd1985ceeeba27a3c9ddafbc5898ae From bf1f3489521c49a7db362dbede8364f3ef0c3944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 16 Mar 2023 06:00:21 +0100 Subject: [PATCH 13/29] croc: update to 9.6.4. --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 24689ada0868..cd071c7738cb 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=9.6.3 +version=9.6.4 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} @@ -9,7 +9,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=6b935a30ae90e971676872aa6401065d1ece5bb6d4b7b9e370afe96affb2c5bc +checksum=e658f15c795da42286563ba5b71e213adfcd8849e5cfba4d3f8451b777c827b9 post_install() { vlicense LICENSE From a4baaef41821b9cb1764a6312a39e47bd25bfb5e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 16 Mar 2023 01:22:00 +0100 Subject: [PATCH 14/29] fatsort: update to 1.6.5.640. --- srcpkgs/fatsort/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fatsort/template b/srcpkgs/fatsort/template index 0bc5803d3969..78b8c2f53aec 100644 --- a/srcpkgs/fatsort/template +++ b/srcpkgs/fatsort/template @@ -1,6 +1,6 @@ # Template file for 'fatsort' pkgname=fatsort -version=1.6.4.625 +version=1.6.5.640 revision=1 build_style=gnu-makefile make_check_target=tests @@ -10,8 +10,9 @@ short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions" maintainer="tibequadorian " license="GPL-2.0-or-later" homepage="https://fatsort.sourceforge.io/" +changelog="https://fatsort.sourceforge.io/CHANGES.html" distfiles="${SOURCEFORGE_SITE}/project/fatsort/fatsort-${version}.tar.xz" -checksum=9a6f89a0640bb782d82ff23a780c9f0aec3dfbe4682c0a8eda157e0810642ead +checksum=630ece56d9eb3a55524af0aec3aade7854360eba949172a6cfb4768cb8fbe42e if [ "$XBPS_TARGET_LIBC" = musl ]; then broken="most tests are failed" From 231957cbb110caee9daa3a82b5bd359a63bcfda6 Mon Sep 17 00:00:00 2001 From: Eloi Torrents Date: Wed, 15 Mar 2023 23:01:34 +0100 Subject: [PATCH 15/29] pyradio: update to 0.9.1. --- srcpkgs/pyradio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template index 12ef5ce2b320..45d73555d2cc 100644 --- a/srcpkgs/pyradio/template +++ b/srcpkgs/pyradio/template @@ -1,17 +1,17 @@ # Template file for 'pyradio' pkgname=pyradio -version=0.8.9.32 +version=0.9.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-dnspython python3-psutil" short_desc="Curses based internet radio player" -maintainer="Orphaned " +maintainer="Eloi Torrents " license="MIT" homepage="http://www.coderholic.com/pyradio/" changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog" distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz" -checksum=d86f13849151aa9ea5d40310cfb827a3bd7138e8809affa9a0442fbc427b5df6 +checksum=0510eabdc5473b90821b38c142cf4dfa8229cb3c52d534fbfc625a0515f6f1e3 make_check=no # pytest reports "no tests ran" post_install() { From 573f3add453238677f33387a279a9562b7886ba7 Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 15 Mar 2023 21:56:47 +0530 Subject: [PATCH 16/29] python3-pipx: update to 1.2.0. --- srcpkgs/python3-pipx/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template index f2e3b673a12e..c0cbecd87371 100644 --- a/srcpkgs/python3-pipx/template +++ b/srcpkgs/python3-pipx/template @@ -1,17 +1,17 @@ # Template file for 'python3-pipx' pkgname=python3-pipx -version=1.1.0 -revision=2 +version=1.2.0 +revision=1 build_style=python3-pep517 hostmakedepends="hatchling" -depends="python3-argcomplete python3-packaging python3-userpath" +depends="python3-argcomplete python3-packaging python3-platformdirs python3-userpath" short_desc="Install and Run Python Applications in Isolated Environments" maintainer="Leah Neukirchen " license="MIT" homepage="https://pypa.github.io/pipx/" changelog="https://pypa.github.io/pipx/changelog/" distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz" -checksum=4d2f70daf15f121e90b7394b0730ee82fc39d7da514e50a7bbf8066be88883bb +checksum=d1908041d24d525cafebeb177efb686133d719499cb55c54f596c95add579286 post_install() { vlicense LICENSE From 1fb3ab5766bb95cb14077f076bd8553a5781ac32 Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 16 Mar 2023 00:39:52 +0530 Subject: [PATCH 17/29] srain: update to 1.5.0. Adopt. --- srcpkgs/srain/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template index 83f5de00648c..4ab23a5a6e7c 100644 --- a/srcpkgs/srain/template +++ b/srcpkgs/srain/template @@ -1,16 +1,17 @@ # Template file for 'srain' pkgname=srain -version=1.3.2 +version=1.5.0 revision=1 build_style=meson build_helper=gir -configure_args="--prefix=/usr --sysconfdir=/etc" +configure_args="-Ddoc_builders=['html','man']" hostmakedepends="pkg-config gettext glib-devel python3-Sphinx" makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel libsecret-devel libsoup-devel" short_desc="Modern IRC client written in GTK" -maintainer="Orphaned " +maintainer="icp " license="GPL-3.0-linking-exception" -homepage="https://srain.im/" -distfiles="https://github.com/SrainApp/srain/archive/${version}.tar.gz" -checksum=a9e0a6d36e57c091236f9a4aaddb255173411a8532499658fa6e464d40ebb665 +homepage="https://srain.silverrainz.me/" +changelog="https://srain.silverrainz.me/changelog.html" +distfiles="https://github.com/SrainApp/srain/archive/refs/tags/${version}.tar.gz" +checksum=7e4b1297f1648e885ed92c69167d911b75fef99030af954b73a81a5c4e0ce64f From aba146ab59be2b2d3ae5463544d9d3bed75db339 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 Mar 2023 13:34:33 +0100 Subject: [PATCH 18/29] tpm2-totp: orphan --- srcpkgs/tpm2-totp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template index 4bf31a0c6469..d168908c88de 100644 --- a/srcpkgs/tpm2-totp/template +++ b/srcpkgs/tpm2-totp/template @@ -7,7 +7,7 @@ hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $ makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel" checkdepends="iproute2 oath-toolkit-devel swtpm tpm2-tools" short_desc="Attest the trustworthiness of a device using TOTP" -maintainer="Marcin Puc " +maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/tpm2-software/tpm2-totp" changelog="https://raw.githubusercontent.com/tpm2-software/tpm2-totp/master/CHANGELOG.md" From 4b6653d48e2d4eb78c823ab8aebd067769bf7b00 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 Mar 2023 13:34:53 +0100 Subject: [PATCH 19/29] tpm2-tools: orphan --- srcpkgs/tpm2-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template index 0bd3d595a397..4682f5f91dc0 100644 --- a/srcpkgs/tpm2-tools/template +++ b/srcpkgs/tpm2-tools/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)" makedepends="libcurl-devel openssl-devel tpm2-tss-devel" short_desc="Trusted Platform Module (TPM2.0) tools" -maintainer="Marcin Puc " +maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/tpm2-software/tpm2-tools/" changelog="https://raw.githubusercontent.com/tpm2-software/tpm2-tools/master/docs/CHANGELOG.md" From af209dc92fd39ca50aa66257fa16ebf0978376a7 Mon Sep 17 00:00:00 2001 From: Henry Precheur Date: Thu, 16 Mar 2023 07:42:51 -0700 Subject: [PATCH 20/29] zoom: update to 5.13.11.1288 --- srcpkgs/zoom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index 62bad8d41f19..0c5a0e269024 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,6 +1,6 @@ # Template file for 'zoom' pkgname=zoom -version=5.13.10.1208 +version=5.13.11.1288 revision=1 archs="x86_64" create_wrksrc=yes @@ -13,7 +13,7 @@ maintainer="Orphaned " license="custom:Proprietary" homepage="https://zoom.us/" distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm" -checksum=228d61c62996df0817900985fe36ae3f16e8279f55990658f97578982dd4b6e8 +checksum=55271393c1bd90d3ec260069bdec78df09305b5bbdcd99d199ea2432ed0eeb7e repository=nonfree noshlibprovides=yes noverifyrdeps=yes From 1c20986dba682196dd847024978549d5e6e2a2c5 Mon Sep 17 00:00:00 2001 From: xolophreny Date: Thu, 16 Mar 2023 09:11:12 +0500 Subject: [PATCH 21/29] vkBasalt: update to 0.3.2.9 --- srcpkgs/vkBasalt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vkBasalt/template b/srcpkgs/vkBasalt/template index 5d6cbfd55f45..0436662e65b1 100644 --- a/srcpkgs/vkBasalt/template +++ b/srcpkgs/vkBasalt/template @@ -1,6 +1,6 @@ # Template file for 'vkBasalt' pkgname=vkBasalt -version=0.3.2.8 +version=0.3.2.9 revision=1 build_style=meson hostmakedepends="glslang pkg-config" @@ -10,4 +10,4 @@ maintainer="xolophreny " license="Zlib" homepage="https://github.com/DadSchoorse/vkBasalt" distfiles="https://github.com/DadSchoorse/vkBasalt/archive/v${version}.tar.gz" -checksum=39520db660c5507bd79bc758a636c8ce73ac78afcd9c9bb26c9f4447f58ec181 +checksum=f13ff6e8f05218800f0fb516f927983170d5ad4dc661ad671bc1fbc436d53b46 From 94d0e3b7941d006ac9fb858e8bad7c09499f017e Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Mon, 30 Jan 2023 05:08:43 +1100 Subject: [PATCH 22/29] CastXML: update to 0.5.1. --- srcpkgs/CastXML/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template index 5d7d9503658c..00e82ac66b50 100644 --- a/srcpkgs/CastXML/template +++ b/srcpkgs/CastXML/template @@ -1,6 +1,6 @@ # Template file for 'CastXML' pkgname=CastXML -version=0.4.6 +version=0.5.1 revision=1 build_style=cmake configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man" @@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov " license="Apache-2.0" homepage="https://github.com/CastXML/CastXML" distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz" -checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a +checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006 post_install() { rm -r ${DESTDIR}/usr/share/castxml/clang/include From 9e8d55c6aa7bbb403be71d306391354033c408cc Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Sat, 17 Sep 2022 22:34:08 +1100 Subject: [PATCH 23/29] gnuradio: update to 3.10.5.1. --- common/shlibs | 44 +-- .../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------ srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------ .../skip-test-that-hangs-on-32bit.patch | 26 -- srcpkgs/gnuradio/template | 6 +- 5 files changed, 25 insertions(+), 396 deletions(-) delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch diff --git a/common/shlibs b/common/shlibs index 5cc81b9f90b2..8a7c321774fc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3241,28 +3241,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.0 volk-3.0.0_1 -libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1 -libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1 +libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1 +libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.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 diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch deleted file mode 100644 index a0c3f6d4701b..000000000000 --- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch +++ /dev/null @@ -1,79 +0,0 @@ -Upstream: no - -Honestly, I don't care much. I tries to print as much as it makes sense ---- a/gnuradio-runtime/include/gnuradio/logger.h -+++ b/gnuradio-runtime/include/gnuradio/logger.h -@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr - #include - #include - #include -+#include -+#include -+#include - - #include - -@@ -285,6 +288,52 @@ struct fmt::formatter : f - } - }; - -+namespace fmt { -+template -+struct formatter< -+ T, -+ typename std::enable_if< -+ std::is_convertible< -+ decltype(std::declval().identifier()), -+ std::string -+ >::value, -+ char -+ >::type > : fmt::formatter { -+ template -+ auto format(const T& value, FormatCtx& ctx) -+ -> decltype(fmt::formatter::format(value.identifier(), ctx)) -+ { -+ return fmt::formatter::format(value.identifier(), ctx); -+ } -+}; -+template -+struct formatter, Ch> : fmt::formatter { -+ template -+ auto format(const std::shared_ptr& ptr, FormatCtx& ctx) -+ -> decltype(fmt::formatter::format(fmt::ptr(ptr), ctx)) -+ { -+ return fmt::formatter::format(fmt::ptr(ptr), ctx); -+ } -+}; -+template -+struct formatter< -+ std::shared_ptr, -+ typename std::enable_if< -+ std::is_convertible< -+ decltype(std::declval().identifier()), -+ std::string -+ >::value, -+ char -+ >::type > : fmt::formatter { -+ template -+ auto format(const std::shared_ptr& ptr, FormatCtx& ctx) -+ -> decltype(fmt::formatter::format(ptr->identifier(), ctx)) -+ { -+ return fmt::formatter::format(ptr->identifier(), ctx); -+ } -+}; -+} -+ - #endif - - #endif /* INCLUDED_GR_LOGGER_H */ ---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc -+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc -@@ -15,7 +15,7 @@ - /* BINDTOOL_GEN_AUTOMATIC(0) */ - /* BINDTOOL_USE_PYGCCXML(0) */ - /* BINDTOOL_HEADER_FILE(logger.h) */ --/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */ -+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */ - /***********************************************************************************/ - - #include diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch deleted file mode 100644 index 43094abeb976..000000000000 --- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch +++ /dev/null @@ -1,266 +0,0 @@ -From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001 -From: Clayton Smith -Date: Fri, 14 Oct 2022 15:39:20 -0400 -Subject: [PATCH] blocks: Allow for floating point error in moving average test - -Signed-off-by: Clayton Smith ---- - gr-blocks/python/blocks/qa_moving_average.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py -index 8f4169d05cf..6aa3ba3df35 100644 ---- a/gr-blocks/python/blocks/qa_moving_average.py -+++ b/gr-blocks/python/blocks/qa_moving_average.py -@@ -147,7 +147,7 @@ def test_vector_complex(self): - ref_data = ref_dst.data() - - # make sure result is close to zero -- self.assertEqual(dut_data, ref_data) -+ self.assertListAlmostEqual(dut_data, ref_data, tol=3) - - def test_complex_scalar(self): - tb = self.tb - -From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001 -From: Clayton Smith -Date: Fri, 14 Oct 2022 15:52:54 -0400 -Subject: [PATCH] fft: Increase tolerance in qa_window test - -Signed-off-by: Clayton Smith ---- - gr-fft/python/fft/qa_window.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py -index 93ab1a9f93f..ec4877f7867 100644 ---- a/gr-fft/python/fft/qa_window.py -+++ b/gr-fft/python/fft/qa_window.py -@@ -35,7 +35,7 @@ def test_normwin(self): - 21, - normalize=True) - power = numpy.sum([x * x for x in win]) / len(win) -- self.assertAlmostEqual(power, 1.0) -+ self.assertAlmostEqual(power, 1.0, places=6) - - - if __name__ == '__main__': - -From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001 -From: Clayton Smith -Date: Fri, 14 Oct 2022 17:29:30 -0400 -Subject: [PATCH 1/2] digital: Account for floating point error in loop - conditions - -Signed-off-by: Clayton Smith ---- - gr-digital/lib/constellation.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc -index 609b4546b83..4235d17f202 100644 ---- a/gr-digital/lib/constellation.cc -+++ b/gr-digital/lib/constellation.cc -@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr) - float maxd = 1.0f; - float step = (2.0f * maxd) / (d_lut_scale - 1); - float y = -maxd; -- while (y < maxd + step) { -+ while (y < maxd + (step / 2)) { - float x = -maxd; -- while (x < maxd + step) { -+ while (x < maxd + (step / 2)) { - gr_complex pt = gr_complex(x, y); - d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr)); - x += step; - -From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001 -From: Clayton Smith -Date: Fri, 14 Oct 2022 17:31:33 -0400 -Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation - -Signed-off-by: Clayton Smith ---- - gr-digital/python/digital/qa_constellation.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py -index 7345f782a2c..1ad86a8d263 100644 ---- a/gr-digital/python/digital/qa_constellation.py -+++ b/gr-digital/python/digital/qa_constellation.py -@@ -117,10 +117,10 @@ def threed_constell(): - def slicer(x): - ret = [] - for xi in x: -- if(xi < 0): -+ if xi < 0: - ret.append(0.0) -- else: -- ret.append(1.0) -+ else: -+ ret.append(1.0) - return ret - - -From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001 -From: Clayton Smith -Date: Sat, 15 Oct 2022 10:44:37 -0400 -Subject: [PATCH] fec: Fix LDPC output size calculation - -Signed-off-by: Clayton Smith ---- - gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +- - gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc -index a76bd76bae2..56a7aeab4c5 100644 ---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc -+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc -@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size) - - d_frame_size = frame_size; - -- d_output_size = static_cast(d_rate * d_frame_size); -+ d_output_size = static_cast(round(d_rate * d_frame_size)); - - return ret; - } -diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc -index f9aaa1b65b4..1475aba70d4 100644 ---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc -+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc -@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size) - - d_frame_size = frame_size; - -- d_output_size = static_cast(d_rate * d_frame_size); -+ d_output_size = static_cast(round(d_rate * d_frame_size)); - - return ret; - } - -From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001 -From: Clayton Smith -Date: Sun, 16 Oct 2022 08:22:48 -0400 -Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests - -Signed-off-by: Clayton Smith ---- - gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------ - 1 file changed, 45 insertions(+), 17 deletions(-) - -From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001 -From: Clayton Smith -Date: Sun, 16 Oct 2022 08:22:48 -0400 -Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests - -Signed-off-by: Clayton Smith ---- - gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------ - 1 file changed, 45 insertions(+), 17 deletions(-) - -diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py -index 6151641aa3c..195e19ab9a3 100644 ---- a/gr-analog/python/analog/qa_ctcss_squelch.py -+++ b/gr-analog/python/analog/qa_ctcss_squelch.py -@@ -9,6 +9,8 @@ - # - - -+import math -+import random - from gnuradio import gr, gr_unittest, analog, blocks - - -@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self): - - def test_ctcss_squelch_002(self): - # Test runtime, gate=True -- rate = 1 -+ rate = 8000 - freq = 100 -- level = 0.0 -- length = 1 -- ramp = 1 -+ other_freq = 103.5 -+ level = 0.01 -+ length = 0 -+ ramp = 0 - gate = True - -- src_data = [float(x) / 10.0 for x in range(1, 40)] -- expected_result = src_data -- expected_result[0] = 0 -+ random.seed(1) -+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)] -+ -+ # First half-second has incorrect CTCSS tone -+ for x in range(0, int(rate * 0.500)): -+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate) -+ -+ # Second half-second has correct CTCSS tone -+ for x in range(int(rate * 0.500), rate): -+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate) - - src = blocks.vector_source_f(src_data) - op = analog.ctcss_squelch_ff(rate, freq, level, -@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self): - self.tb.run() - - result_data = dst.data() -- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4) -+ -+ # Squelch should open ~100 ms after the correct CTCSS tone appears -+ # so ~400 ms of audio should make it past the gate -+ self.assertGreater(len(result_data), rate * 0.390) -+ self.assertLess(len(result_data), rate * 0.410) -+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6) - - def test_ctcss_squelch_003(self): - # Test runtime, gate=False -- rate = 1 -+ rate = 8000 - freq = 100 -- level = 0.5 -- length = 1 -- ramp = 1 -+ other_freq = 103.5 -+ level = 0.01 -+ length = 0 -+ ramp = 0 - gate = False - -- src_data = [float(x) / 10.0 for x in range(1, 40)] -+ random.seed(1) -+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)] -+ -+ # First half-second has incorrect CTCSS tone -+ for x in range(0, rate // 2): -+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate) -+ -+ # Second half-second has correct CTCSS tone -+ for x in range(rate // 2, rate): -+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate) -+ - src = blocks.vector_source_f(src_data) - op = analog.ctcss_squelch_ff(rate, freq, level, - length, ramp, gate) -@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self): - self.tb.connect(op, dst) - self.tb.run() - -- expected_result = src_data -- expected_result[0:5] = [0, 0, 0, 0, 0] -- - result_data = dst.data() -- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4) -+ -+ # Squelch should open ~100 ms after the correct CTCSS tone appears -+ min_zero_samples = int(rate * 0.590) -+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6) -+ max_zero_samples = int(rate * 0.610) -+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6) - - - if __name__ == '__main__': diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch deleted file mode 100644 index 25a694211100..000000000000 --- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch +++ /dev/null @@ -1,26 +0,0 @@ -Skip one test that hangs forever on 32 bit - -See: https://github.com/gnuradio/gnuradio/issues/989 - ---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300 -+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300 -@@ -98,6 +98,9 @@ - self.assertEqual(data_in, data_out) - - def test_parallelism0_03(self): -+ from ctypes import sizeof, c_long -+ if sizeof(c_long) <= 4: -+ return - filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist" - gap = 4 - LDPC_matrix_object = fec.ldpc_G_matrix(filename) -@@ -115,6 +118,9 @@ - self.assertEqual(data_in, data_out) - - def test_parallelism0_03(self): -+ from ctypes import sizeof, c_long -+ if sizeof(c_long) <= 4: -+ return - filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist" - gap = 4 - k = 100 - 58 diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 9571677a2085..7c74168e8f59 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio -version=3.10.3.0 -revision=9 +version=3.10.5.1 +revision=1 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax @@ -22,7 +22,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=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75 +checksum=85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f python_version=3 if [ "$CROSS_BUILD" ]; then From 3f33b461fddd2a3ea5a60ac191dd39a97a3b3d15 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Mon, 10 Oct 2022 22:39:32 +1100 Subject: [PATCH 24/29] gnuradio-osmosdr: update to 0.2.4. --- srcpkgs/gnuradio-osmosdr/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index 2b118119d010..c8680ff1d478 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,8 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr -version=0.2.3git20210128 -revision=6 -_githash=a100eb024c0210b95e4738b6efd836d48225bd03 +version=0.2.4 +revision=1 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" @@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR" -distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz" -checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1 +distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz" +checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63 gnuradio-osmosdr-devel_package() { short_desc+=" - development files" From bc46b40ba75b7436fe0c8c73746fc855e06dde88 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Fri, 25 Nov 2022 20:24:41 +1100 Subject: [PATCH 25/29] gnuradio-nrsc5: revbump for gnuradio 3.10.5.1 --- srcpkgs/gnuradio-nrsc5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template index bd544baa4f07..2181d8bd44be 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=3 +revision=4 build_style=cmake make_cmd=make configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" From 8517f9bb2b90725b7fe12a8f356339adf2df38c3 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Thu, 5 Jan 2023 21:14:50 +1100 Subject: [PATCH 26/29] gnuradio-rds: revbump for gnuradio 3.10.5.1 --- srcpkgs/gnuradio-rds/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index b8a95ac05d79..09a928d3759b 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=5 +revision=6 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" From b7b44a7dd9f301abe7bd33d00e67a3faf477fdcb Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Fri, 10 Mar 2023 11:08:08 +1100 Subject: [PATCH 27/29] gqrx: revbump for gnuradio 3.10.5.1 --- srcpkgs/gqrx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template index c2215b30dc9b..1966c2a8f09b 100644 --- a/srcpkgs/gqrx/template +++ b/srcpkgs/gqrx/template @@ -1,7 +1,7 @@ # Template file for 'gqrx' pkgname=gqrx version=2.15.9 -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)" From 760dc66e8b3021b6903639ef70fbbab13413a4d7 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 13 Feb 2023 21:08:47 -0500 Subject: [PATCH 28/29] wpa_supplicant: add CONFIG_EXT_PASSWORD_FILE=y --- srcpkgs/wpa_supplicant/files/config | 2 +- srcpkgs/wpa_supplicant/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config index 9bf3739d1963..b6ee819a17f8 100644 --- a/srcpkgs/wpa_supplicant/files/config +++ b/srcpkgs/wpa_supplicant/files/config @@ -531,7 +531,7 @@ CONFIG_WIFI_DISPLAY=y # External password backend for testing purposes (developer use) #CONFIG_EXT_PASSWORD_TEST=y # File-based backend to read passwords from an external file. -#CONFIG_EXT_PASSWORD_FILE=y +CONFIG_EXT_PASSWORD_FILE=y # Enable Fast Session Transfer (FST) #CONFIG_FST=y diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index fed83afea8b8..b6fe5dcf479a 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.10 -revision=1 +revision=2 build_wrksrc="$pkgname" short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Enno Boland " From 9dc006c154793389c0a7b460e5249bf477d6aec7 Mon Sep 17 00:00:00 2001 From: tororutsu Date: Wed, 15 Mar 2023 21:15:16 -0400 Subject: [PATCH 29/29] discord: add missing dependency Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com> --- srcpkgs/discord/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/discord/template b/srcpkgs/discord/template index 8267d9a88c14..50c1cfb68e51 100644 --- a/srcpkgs/discord/template +++ b/srcpkgs/discord/template @@ -1,10 +1,10 @@ # Template file for 'discord' pkgname=discord version=0.0.25 -revision=1 +revision=2 archs="x86_64" depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic - xdg-utils webrtc-audio-processing" + xdg-utils webrtc-audio-processing libXScrnSaver" short_desc="Chat and VOIP application" maintainer="Ryan Conwell " license="custom:Proprietary"