From 55a304331990b872882917627c14087b8d0ea2ea Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 19 Jan 2022 15:20:58 +0100 Subject: [PATCH 01/49] fail2ban: add patch for python 3.10 --- srcpkgs/fail2ban/patches/python3.10.patch | 103 ++++++++++++++++++++++ srcpkgs/fail2ban/template | 2 +- 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/fail2ban/patches/python3.10.patch diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch new file mode 100644 index 000000000000..a44fc9aa7645 --- /dev/null +++ b/srcpkgs/fail2ban/patches/python3.10.patch @@ -0,0 +1,103 @@ +From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Mon, 8 Feb 2021 16:44:27 +0100 +Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931) + +--- + .github/workflows/main.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml +index 7a1d31df3d..262448c2da 100644 +--- a/.github/workflows/main.yml ++++ b/.github/workflows/main.yml +@@ -22,7 +22,7 @@ jobs: + runs-on: ubuntu-20.04 + strategy: + matrix: +- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3] ++ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10.0-alpha.5', pypy2, pypy3] + fail-fast: false + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + +From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Mon, 8 Feb 2021 17:19:24 +0100 +Subject: [PATCH 2/4] follow bpo-37324: + :ref:`collections-abstract-base-classes` moved to the :mod:`collections.abc` + module + +(since 3.10-alpha.5 `MutableMapping` is missing in collections module) +--- + fail2ban/server/action.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py +index 3bc48fe046..f0f1e6f59a 100644 +--- a/fail2ban/server/action.py ++++ b/fail2ban/server/action.py +@@ -30,7 +30,10 @@ + import threading + import time + from abc import ABCMeta +-from collections import MutableMapping ++try: ++ from collections.abc import MutableMapping ++except ImportError: ++ from collections import MutableMapping + + from .failregex import mapTag2Opt + from .ipdns import DNSUtils + +From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Mon, 8 Feb 2021 17:25:45 +0100 +Subject: [PATCH 3/4] amend for `Mapping` + +--- + fail2ban/server/actions.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py +index b7b95b445a..897d907c1a 100644 +--- a/fail2ban/server/actions.py ++++ b/fail2ban/server/actions.py +@@ -28,7 +28,10 @@ + import os + import sys + import time +-from collections import Mapping ++try: ++ from collections.abc import Mapping ++except ImportError: ++ from collections import Mapping + try: + from collections import OrderedDict + except ImportError: + +From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Mon, 8 Feb 2021 17:35:59 +0100 +Subject: [PATCH 4/4] amend for `Mapping` (jails) + +--- + fail2ban/server/jails.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fail2ban/server/jails.py b/fail2ban/server/jails.py +index 972a8c4bd2..27e12ddf65 100644 +--- a/fail2ban/server/jails.py ++++ b/fail2ban/server/jails.py +@@ -22,7 +22,10 @@ + __license__ = "GPL" + + from threading import Lock +-from collections import Mapping ++try: ++ from collections.abc import Mapping ++except ImportError: ++ from collections import Mapping + + from ..exceptions import DuplicateJailException, UnknownJailException + from .jail import Jail diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template index 0498ef9672af..686ddb8dd0e3 100644 --- a/srcpkgs/fail2ban/template +++ b/srcpkgs/fail2ban/template @@ -1,7 +1,7 @@ # Template file for 'fail2ban' pkgname=fail2ban version=0.11.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="pkg-config python3" depends="python3" From d55cd6ff186942a0690b5e64c16e236f1f26dd0b Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Tue, 18 Jan 2022 14:10:12 -0600 Subject: [PATCH 02/49] apache-jmeter: update to 5.4.3. --- srcpkgs/apache-jmeter/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apache-jmeter/template b/srcpkgs/apache-jmeter/template index 3c5de75a2502..38c3d7e61983 100644 --- a/srcpkgs/apache-jmeter/template +++ b/srcpkgs/apache-jmeter/template @@ -1,6 +1,6 @@ # Template file for 'apache-jmeter' pkgname=apache-jmeter -version=5.3 +version=5.4.3 revision=1 hostmakedepends="openjdk8 gradle" depends="virtual?java-runtime" @@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://jmeter.apache.org/" distfiles="http://apache.osuosl.org/jmeter/source/apache-jmeter-${version}_src.tgz" -checksum=727d7c0cf2b72c0c3983c603a6700df7b797dbcbf19dcd7fa2aa457627324ff0 +checksum=6f5bfa63f90a8e05d23064a6e431bc34ff1d093ac2769283d506430edc141682 case "$XBPS_MACHINE" in ppc64*) ;; @@ -18,7 +18,7 @@ esac do_build() { # Tests fail -- they are too dependent on networking environment - gradle -PchecksumIgnore -x test createDist + JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ ./gradlew -PchecksumIgnore -x test createDist } do_install() { @@ -29,6 +29,7 @@ do_install() { vcopy xdocs/* usr/share/doc/apache-jmeter rm -rf xdocs + rm -rf src vmkdir usr/libexec/apache-jmeter vcopy * usr/libexec/apache-jmeter From b09982f13739c9e97582e7ffd854e7a768c3228e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 14 Jan 2022 16:31:25 -0300 Subject: [PATCH 03/49] New package: python3-cvxopt-1.2.7 --- srcpkgs/python3-cvxopt/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-cvxopt/template diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template new file mode 100644 index 000000000000..0fb769b294e0 --- /dev/null +++ b/srcpkgs/python3-cvxopt/template @@ -0,0 +1,20 @@ +# Template file for 'python3-cvxopt' +pkgname=python3-cvxopt +version=1.2.7 +revision=1 +wrksrc="cvxopt-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel glpk-devel" +checkdepends="python3-pytest" +short_desc="Python software for convex optimization" +maintainer="Gonzalo Tornaría " +license="GPL-3.0-or-later" +homepage="http://cvxopt.org/" +distfiles="${PYPI_SITE}/c/cvxopt/cvxopt-${version}.tar.gz" +checksum=3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504 + +pre_build() { + export CVXOPT_BUILD_GSL=1 + export CVXOPT_BUILD_GLPK=1 +} From 6a80216cf34bc5bc56867c81e7e8015ae3565508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 13:05:37 -0300 Subject: [PATCH 04/49] New package: python3-memory_allocator-0.1.2 --- srcpkgs/python3-memory_allocator/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/python3-memory_allocator/template diff --git a/srcpkgs/python3-memory_allocator/template b/srcpkgs/python3-memory_allocator/template new file mode 100644 index 000000000000..e4fbb51478fa --- /dev/null +++ b/srcpkgs/python3-memory_allocator/template @@ -0,0 +1,14 @@ +# Template file for 'python3-memory_allocator' +pkgname=python3-memory_allocator +version=0.1.2 +revision=1 +wrksrc=memory_allocator-$version +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython" +makedepends="python3-devel" +short_desc="Extension class to allocate memory easily with cython" +maintainer="Gonzalo Tornaría " +license="GPL-3.0-or-later" +homepage="https://github.com/kliem/memory_allocator" +distfiles="${PYPI_SITE}/m/memory_allocator/memory_allocator-${version}.tar.gz" +checksum=ddf42a2dcc678062f30c63c868335204d46a4ecdf4db0dc43ed4529f1d0ffab9 From a4c77e8366c7f5b8bacaf5b37106bc89f2c21a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 20:02:33 -0300 Subject: [PATCH 05/49] New package: sage-data-combinatorial_designs-20140630 --- srcpkgs/sage-data-combinatorial_designs/template | 16 ++++++++++++++++ srcpkgs/sage-data-combinatorial_designs/update | 1 + 2 files changed, 17 insertions(+) create mode 100644 srcpkgs/sage-data-combinatorial_designs/template create mode 100644 srcpkgs/sage-data-combinatorial_designs/update diff --git a/srcpkgs/sage-data-combinatorial_designs/template b/srcpkgs/sage-data-combinatorial_designs/template new file mode 100644 index 000000000000..dcec3dbf554b --- /dev/null +++ b/srcpkgs/sage-data-combinatorial_designs/template @@ -0,0 +1,16 @@ +# Template file for 'sage-data-combinatorial_designs' +pkgname=sage-data-combinatorial_designs +version=20140630 +revision=1 +wrksrc="combinatorial_designs-$version" +short_desc="Data for combinatorial designs" +maintainer="Gonzalo Tornaría " +license="Public Domain" +homepage="https://mirrors.mit.edu/sage/spkg/upstream/combinatorial_designs/" +distfiles="https://mirrors.mit.edu/sage/spkg/upstream/combinatorial_designs/combinatorial_designs-$version.tar.bz2" +checksum=c9486c6d7ec71da338589a6e301723be4e55e02dcfc41f8dba11a682e3b3482e + +do_install() { + vmkdir usr/share/sagemath/combinatorial_designs + vcopy * usr/share/sagemath/combinatorial_designs +} diff --git a/srcpkgs/sage-data-combinatorial_designs/update b/srcpkgs/sage-data-combinatorial_designs/update new file mode 100644 index 000000000000..d66b1a8e41a0 --- /dev/null +++ b/srcpkgs/sage-data-combinatorial_designs/update @@ -0,0 +1 @@ +pkgname=combinatorial_designs From b24d4f91555a957e54a2907bb4ff8a2f21006a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 20:02:34 -0300 Subject: [PATCH 06/49] New package: sage-data-conway_polynomials-0.5 --- srcpkgs/sage-data-conway_polynomials/template | 21 +++++++++++++++++++ srcpkgs/sage-data-conway_polynomials/update | 1 + 2 files changed, 22 insertions(+) create mode 100644 srcpkgs/sage-data-conway_polynomials/template create mode 100644 srcpkgs/sage-data-conway_polynomials/update diff --git a/srcpkgs/sage-data-conway_polynomials/template b/srcpkgs/sage-data-conway_polynomials/template new file mode 100644 index 000000000000..57264da84c2f --- /dev/null +++ b/srcpkgs/sage-data-conway_polynomials/template @@ -0,0 +1,21 @@ +# Template file for 'sage-data-conway_polynomials' +pkgname=sage-data-conway_polynomials +version=0.5 +revision=1 +wrksrc="conway_polynomials-$version" +hostmakedepends="python3" +short_desc="Database of Conway polynomials over finite fields" +maintainer="Gonzalo Tornaría " +license="Public Domain, GPL-2.0-or-later" +homepage="https://mirrors.mit.edu/sage/spkg/upstream/conway_polynomials/" +distfiles="https://mirrors.mit.edu/sage/spkg/upstream/conway_polynomials/conway_polynomials-$version.tar.bz2 + https://github.com/sagemath/sage/raw/9.4/build/pkgs/conway_polynomials/spkg-install.py" +checksum="d8f2788a85b1c2482cc4abe1a35d3da777445e21ec49b031d36b899e3c0deb17 + da85e913282d059ca36e14cefc92f891da469e8d7127f13a1ce96c6fb5c296af" +skip_extraction=spkg-install.py + +do_install() { + ln -s . src + SAGE_SHARE=${DESTDIR}/usr/share/sagemath PYTHONPATH=${PWD} \ + python3 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/spkg-install.py +} diff --git a/srcpkgs/sage-data-conway_polynomials/update b/srcpkgs/sage-data-conway_polynomials/update new file mode 100644 index 000000000000..628e2749f014 --- /dev/null +++ b/srcpkgs/sage-data-conway_polynomials/update @@ -0,0 +1 @@ +pkgname=conway_polynomials From 5143f6ef291867ec1e9d14973244f1604c249a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 20:02:34 -0300 Subject: [PATCH 07/49] New package: sage-data-elliptic_curves-0.8.1 --- srcpkgs/sage-data-elliptic_curves/template | 21 +++++++++++++++++++++ srcpkgs/sage-data-elliptic_curves/update | 1 + 2 files changed, 22 insertions(+) create mode 100644 srcpkgs/sage-data-elliptic_curves/template create mode 100644 srcpkgs/sage-data-elliptic_curves/update diff --git a/srcpkgs/sage-data-elliptic_curves/template b/srcpkgs/sage-data-elliptic_curves/template new file mode 100644 index 000000000000..5103f9b87374 --- /dev/null +++ b/srcpkgs/sage-data-elliptic_curves/template @@ -0,0 +1,21 @@ +# Template file for 'sage-data-elliptic_curves' +pkgname=sage-data-elliptic_curves +version=0.8.1 +revision=1 +wrksrc="elliptic_curves-$version" +hostmakedepends="python3" +short_desc="Database of elliptic curves" +maintainer="Gonzalo Tornaría " +license="Public Domain, GPL-2.0-or-later" +homepage="https://mirrors.mit.edu/sage/spkg/upstream/elliptic_curves/" +distfiles="https://mirrors.mit.edu/sage/spkg/upstream/elliptic_curves/elliptic_curves-$version.tar.bz2 + https://github.com/sagemath/sage/raw/9.4/build/pkgs/elliptic_curves/spkg-install.py" +checksum="5fba5470d9d91f06282ed5edfc45bf0ea1c5f7c8d4837c46234b17be1481fd50 + 856d482872f72db47c7b718761bb1a205947b276df99b55d087a57130932cf84" +skip_extraction=spkg-install.py + +do_install() { + ln -s . src + SAGE_SHARE=${DESTDIR}/usr/share/sagemath \ + python3 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/spkg-install.py +} diff --git a/srcpkgs/sage-data-elliptic_curves/update b/srcpkgs/sage-data-elliptic_curves/update new file mode 100644 index 000000000000..8155f52ce93b --- /dev/null +++ b/srcpkgs/sage-data-elliptic_curves/update @@ -0,0 +1 @@ +pkgname=elliptic_curves From 0af56a75052e73ded5299d929f96ffad5c4ecc7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 20:02:35 -0300 Subject: [PATCH 08/49] New package: sage-data-polytopes_db-20170220 --- srcpkgs/sage-data-polytopes_db/template | 16 ++++++++++++++++ srcpkgs/sage-data-polytopes_db/update | 1 + 2 files changed, 17 insertions(+) create mode 100644 srcpkgs/sage-data-polytopes_db/template create mode 100644 srcpkgs/sage-data-polytopes_db/update diff --git a/srcpkgs/sage-data-polytopes_db/template b/srcpkgs/sage-data-polytopes_db/template new file mode 100644 index 000000000000..d0f9f297d84b --- /dev/null +++ b/srcpkgs/sage-data-polytopes_db/template @@ -0,0 +1,16 @@ +# Template file for 'sage-data-polytopes_db' +pkgname=sage-data-polytopes_db +version=20170220 +revision=1 +wrksrc="polytopes_db-$version" +short_desc="Database of 2 and 3-dimensional reflexive polytopes" +maintainer="Gonzalo Tornaría " +license="Public Domain" +homepage="https://mirrors.mit.edu/sage/spkg/upstream/polytopes_db/" +distfiles="https://mirrors.mit.edu/sage/spkg/upstream/polytopes_db/polytopes_db-$version.tar.bz2" +checksum=cb788bdfca6e00864ec0bfa67932a68ae68bfeb9c527a91be90ad218026a0ce0 + +do_install() { + vmkdir usr/share/sagemath/reflexive_polytopes + vcopy * usr/share/sagemath/reflexive_polytopes +} diff --git a/srcpkgs/sage-data-polytopes_db/update b/srcpkgs/sage-data-polytopes_db/update new file mode 100644 index 000000000000..f51653b547fd --- /dev/null +++ b/srcpkgs/sage-data-polytopes_db/update @@ -0,0 +1 @@ +pkgname=polytopes_db From e7073216e8067d970fab077995d1c77257dce083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 20:02:35 -0300 Subject: [PATCH 09/49] New package: sage-data-graphs-20210214 --- srcpkgs/sage-data-graphs/template | 16 ++++++++++++++++ srcpkgs/sage-data-graphs/update | 1 + 2 files changed, 17 insertions(+) create mode 100644 srcpkgs/sage-data-graphs/template create mode 100644 srcpkgs/sage-data-graphs/update diff --git a/srcpkgs/sage-data-graphs/template b/srcpkgs/sage-data-graphs/template new file mode 100644 index 000000000000..9ca16b6cf53a --- /dev/null +++ b/srcpkgs/sage-data-graphs/template @@ -0,0 +1,16 @@ +# Template file for 'sage-data-graphs' +pkgname=sage-data-graphs +version=20210214 +revision=1 +wrksrc="graphs-$version" +short_desc="Database of graphs" +maintainer="Gonzalo Tornaría " +license="Public Domain" +homepage="https://mirrors.mit.edu/sage/spkg/upstream/graphs/" +distfiles="https://mirrors.mit.edu/sage/spkg/upstream/graphs/graphs-$version.tar.bz2" +checksum=07237c0d9853611505c389fd7bb92500c8743f5631babb4d0f45dfd8332f3741 + +do_install() { + vmkdir usr/share/sagemath/graphs + vcopy * usr/share/sagemath/graphs +} diff --git a/srcpkgs/sage-data-graphs/update b/srcpkgs/sage-data-graphs/update new file mode 100644 index 000000000000..c5c7c7dd5253 --- /dev/null +++ b/srcpkgs/sage-data-graphs/update @@ -0,0 +1 @@ +pkgname=graphs From abcf4015ef812ef714600600107cdd2cfac1d0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 18 Jan 2022 17:06:51 -0300 Subject: [PATCH 10/49] igraph: update to 0.9.6. --- srcpkgs/igraph/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template index bc7fbef4447f..f131886aae63 100644 --- a/srcpkgs/igraph/template +++ b/srcpkgs/igraph/template @@ -1,6 +1,6 @@ # Template file for 'igraph' pkgname=igraph -version=0.9.5 +version=0.9.6 revision=1 build_style=cmake configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://igraph.org/c/" changelog="https://raw.githubusercontent.com/igraph/igraph/master/CHANGELOG.md" distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz" -checksum=c4e3f67892e1e287865d799162406b3f94916ad6f2cc069a9239e36ca495a17a +checksum=7c299ec54eecfe413758c332a42c4cb71d02d2951b2ac232584d317c5792f387 igraph-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From ac7c0d2eea3e3b35d65ac528202c051b2e6cde63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 18 Jan 2022 16:56:23 -0300 Subject: [PATCH 11/49] arb: update to 2.22.0. --- srcpkgs/arb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/arb/template b/srcpkgs/arb/template index fc99c3cebff6..6bc7c9a84738 100644 --- a/srcpkgs/arb/template +++ b/srcpkgs/arb/template @@ -1,6 +1,6 @@ # Template file for 'arb' pkgname=arb -version=2.21.1 +version=2.22.0 revision=1 build_style=configure configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-flint=/usr" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="https://arblib.org" changelog="https://raw.githubusercontent.com/fredrik-johansson/arb/master/doc/source/history.rst" distfiles="https://github.com/fredrik-johansson/arb/archive/${version}.tar.gz" -checksum=aecc9f55eb35a00a2490e9a7536a0babf8ac86bb13d32a4a95e1216f9f5cbfa8 +checksum=3e40ab8cf61c0cd63d5901064d73eaa2d04727bbdc6eebb1727997958a14f24d CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t From b819a10fddc5d1f075505c59a9e9664ed5aaa017 Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Tue, 18 Jan 2022 14:47:33 -0500 Subject: [PATCH 12/49] font-iosevka: update to 11.2.6. --- srcpkgs/font-iosevka/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template index 894ad7e45211..f76d1f137166 100644 --- a/srcpkgs/font-iosevka/template +++ b/srcpkgs/font-iosevka/template @@ -1,6 +1,6 @@ # Template file for 'font-iosevka' pkgname=font-iosevka -version=11.0.0 +version=11.2.6 revision=1 create_wrksrc=yes depends="font-util" @@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip" checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80 - 71416d2112cf6b934c5518fbbf3ecdcc9933effcb24995030add6a3153782792 - 453901626f47deb25e20fd77ddbe85d705e1550c5172b7878772aa9319c70306" + cab61bc7330c9b1be40eea082b5a11b573e19ea3509330bd3f2d9ffdadb9cd5b + d62edfa62e95df1e93469285c16f9505e23aa99fc88f1e9811d9f88f5d2ad740" font_dirs="/usr/share/fonts/TTF" From 0f87ed9761e710884bffea0372a991e7f3b4e9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 15 Jan 2022 17:32:39 -0300 Subject: [PATCH 13/49] New package: python3-cysignals-1.11.2 --- .../python3-cysignals/patches/fix-write.patch | 46 +++++++++++++++++++ srcpkgs/python3-cysignals/template | 19 ++++++++ 2 files changed, 65 insertions(+) create mode 100644 srcpkgs/python3-cysignals/patches/fix-write.patch create mode 100644 srcpkgs/python3-cysignals/template diff --git a/srcpkgs/python3-cysignals/patches/fix-write.patch b/srcpkgs/python3-cysignals/patches/fix-write.patch new file mode 100644 index 000000000000..18206bd808d7 --- /dev/null +++ b/srcpkgs/python3-cysignals/patches/fix-write.patch @@ -0,0 +1,46 @@ +Fix a doctest failure which triggers in i686. + +The example is in the function `test_bad_str()` in the file `tests.pyx`. +The test pases a bad string to `sig_str()` and then raises `SIGILL`. The +signal handler eventually raises a Python exception which in turn raises +a `SIGSEGV` when accessing the bad string. An error message is expected, +but that doesn't happen. + +Presumably the segfault happens inside some stdio function which leaves +stdio buffers in an inconsistent state so the latter `fprintf` doesn't +work properly. From signal-safety(7): + + Suppose that the main program is in the middle of a call to a + stdio function such as printf(3) where the buffer and associated + variables have been partially updated. If, at that moment, the + program is interrupted by a signal handler that also calls + printf(3), then the second call to printf(3) will operate on + inconsistent data, with unpredictable results. + +We fix this by replacing the `fprintf` by calls to `write`, which is +async-signal-safe according to POSIX. + +--- a/src/cysignals/implementation.c 2022-01-16 22:36:45.143796872 +0000 ++++ b/src/cysignals/implementation.c 2022-01-17 02:22:31.196695043 +0000 +@@ -638,12 +622,15 @@ + #endif + + if (s) { ++ /* Using fprintf from inside a signal handler is undefined, see signal-safety(7) */ ++ const char * message = ++ "\n" ++ "This probably occurred because a *compiled* module has a bug\n" ++ "in it and is not properly wrapped with sig_on(), sig_off().\n" ++ "Python will now terminate.\n" ++ "------------------------------------------------------------------------\n"; ++ write(2, s, strlen(s)); ++ write(2, message, strlen(message)); +- fprintf(stderr, +- "%s\n" +- "This probably occurred because a *compiled* module has a bug\n" +- "in it and is not properly wrapped with sig_on(), sig_off().\n" +- "Python will now terminate.\n", s); +- print_sep(); + } + + dienow: diff --git a/srcpkgs/python3-cysignals/template b/srcpkgs/python3-cysignals/template new file mode 100644 index 000000000000..4655eead2a9c --- /dev/null +++ b/srcpkgs/python3-cysignals/template @@ -0,0 +1,19 @@ +# Template file for 'python3-cysignals' +pkgname=python3-cysignals +version=1.11.2 +revision=1 +wrksrc="cysignals-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython autoconf" +makedepends="python3-devel pari-devel" +short_desc="Interrupt and signal handling for Cython " +maintainer="Gonzalo Tornaría " +license="LGPL-3.0-or-later" +homepage="https://github.com/sagemath/cysignals" +distfiles="${PYPI_SITE}/c/cysignals/cysignals-${version}.tar.gz" +checksum=5858b1760fbe21848121b826b2463a67ac5a45caf3d73105497a68618c5a6fa6 +nocross=yes # runs binaries built for target + +do_check() { + make check +} From 5aa1f221cba91e02c322e8f89312ffdace84b6bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 15 Jan 2022 18:28:55 -0300 Subject: [PATCH 14/49] New package: python3-cypari2-2.1.2 --- srcpkgs/python3-cypari2/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-cypari2/template diff --git a/srcpkgs/python3-cypari2/template b/srcpkgs/python3-cypari2/template new file mode 100644 index 000000000000..18755ec020b4 --- /dev/null +++ b/srcpkgs/python3-cypari2/template @@ -0,0 +1,19 @@ +# Template file for 'python3-cypari2' +pkgname=python3-cypari2 +version=2.1.2 +revision=1 +wrksrc=cypari2-${version} +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython pari perl" +makedepends="python3-devel python3-cysignals pari-devel gmp-devel" +short_desc="Python interface to the number theory library PARI/GP" +maintainer="Gonzalo Tornaría " +license="GPL-2.0-or-later" +homepage="https://github.com/sagemath/cypari2" +distfiles="${PYPI_SITE}/c/cypari2/cypari2-${version}.tar.gz" +checksum=03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a + +do_check() { + PYTHONPATH="$(cd build/lib* && pwd)" \ + make check +} From fbf26a672168f526f04e953f949259da61e62075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 15 Jan 2022 18:56:29 -0300 Subject: [PATCH 15/49] New package: python3-pplpy-0.8.7 --- srcpkgs/python3-pplpy/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/python3-pplpy/template diff --git a/srcpkgs/python3-pplpy/template b/srcpkgs/python3-pplpy/template new file mode 100644 index 000000000000..1cb69ffe6a07 --- /dev/null +++ b/srcpkgs/python3-pplpy/template @@ -0,0 +1,21 @@ +# Template file for 'python3-pplpy' +pkgname=python3-pplpy +version=0.8.7 +revision=1 +wrksrc="pplpy-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython" +makedepends="python3-cysignals python3-gmpy2 python3-devel gmp-devel + gmpxx-devel ppl-devel mpfr-devel libmpc-devel pari-devel" +short_desc="Python wrapper to the C++ Parma Polyhedra Library (PPL)" +maintainer="Gonzalo Tornaría " +license="GPL-3.0-or-later" +homepage="https://gitlab.com/videlec/pplpy" +changelog="https://gitlab.com/videlec/pplpy/-/raw/master/CHANGES.txt" +distfiles="${PYPI_SITE}/p/pplpy/pplpy-${version}.tar.gz" +checksum=500bd0f4ae1a76956fae7fcba77854f5ec3e64fce76803664983763c3f2bd8bd + +do_check() { + PYTHONPATH=$(cd build/lib* && pwd) \ + python setup.py test +} From 135bb6174de89879b9792d89657b365c4d9dd9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 01:14:24 -0300 Subject: [PATCH 16/49] New package: python3-fpylll-0.5.6 --- srcpkgs/python3-fpylll/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/python3-fpylll/template diff --git a/srcpkgs/python3-fpylll/template b/srcpkgs/python3-fpylll/template new file mode 100644 index 000000000000..dd2adcee6fce --- /dev/null +++ b/srcpkgs/python3-fpylll/template @@ -0,0 +1,25 @@ +# Template file for 'python3-fpylll' +pkgname=python3-fpylll +version=0.5.6 +revision=1 +wrksrc="fpylll-${version}" +build_style=python3-module +hostmakedepends="python3-Cython" +makedepends="python3-cysignals python3-devel gmp-devel mpfr-devel fplll-devel + pari-devel" +checkdepends="python3-pytest python3-numpy" +short_desc="Python wrapper to fplll (floating point lattice algorithms)" +maintainer="Gonzalo Tornaría " +license="GPL-2.0-or-later" +homepage="https://github.com/fplll/fpylll" +distfiles="${PYPI_SITE}/f/fpylll/fpylll-${version}.tar.gz" +checksum=6eb8a63fb933c0bf92f290dd66fd884807659214d0ce524afe3687a6a6b13a8b + +case $XBPS_TARGET_MACHINE in + # skip a test with numerical noise on 32 bit + i686*) make_check_args="-k not(averaged_simulate_prob)" ;; +esac + +pre_check() { + export PY_IGNORE_IMPORTMISMATCH=1 +} From e7b5ceef8b8a3314ae797dd9f9a938a784175637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 17 Jan 2022 17:44:04 -0300 Subject: [PATCH 17/49] New package: python3-primecountpy-0.1.0 --- srcpkgs/python3-primecountpy/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-primecountpy/template diff --git a/srcpkgs/python3-primecountpy/template b/srcpkgs/python3-primecountpy/template new file mode 100644 index 000000000000..fecc774b3983 --- /dev/null +++ b/srcpkgs/python3-primecountpy/template @@ -0,0 +1,16 @@ +# Template file for 'python3-primecountpy' +pkgname=python3-primecountpy +version=0.1.0 +revision=1 +wrksrc=primecountpy-${version} +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython" +makedepends="python3-cysignals python3-devel primecount-devel pari-devel" +short_desc="Python interface to the C++ library primecount" +maintainer="Gonzalo Tornaría " +license="GPL-3.0-or-later" +homepage="https://github.com/dimpase/primecountpy" +distfiles="${PYPI_SITE}/p/primecountpy/primecountpy-${version}.tar.gz" +checksum=78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676 + +make_check=no # no way to check before installing From 74b54b464936d667b0382b6e8a463c791e897e7b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 19 Jan 2022 16:31:01 +0100 Subject: [PATCH 18/49] drumkv1: update to 0.9.24. --- srcpkgs/drumkv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template index d24397eaef1e..ff9633954f94 100644 --- a/srcpkgs/drumkv1/template +++ b/srcpkgs/drumkv1/template @@ -1,6 +1,6 @@ # Template file for 'drumkv1' pkgname=drumkv1 -version=0.9.23 +version=0.9.24 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://drumkv1.sourceforge.io/" changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz" -checksum=80db1cb2a1a911f53508d243941033ba6f4cd2fcc94a6e96c796ffce13adfac9 +checksum=b3d7a4105e94c3b29235d2d00ae74d0be6a00d62e791c968056aa64ff7ac6012 From c67c24be5e6db6f5ad9fb0562d628fddb98432b7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 19 Jan 2022 16:31:11 +0100 Subject: [PATCH 19/49] padthv1: update to 0.9.24. --- srcpkgs/padthv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template index 06a29e63219b..59ab088017c8 100644 --- a/srcpkgs/padthv1/template +++ b/srcpkgs/padthv1/template @@ -1,6 +1,6 @@ # Template file for 'padthv1' pkgname=padthv1 -version=0.9.23 +version=0.9.24 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://padthv1.sourceforge.io/" changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/padthv1/padthv1-${version}.tar.gz" -checksum=f7215fbe5b243989c6adaa2ed92dd07df97c468609a84d309c394e3fc9b14208 +checksum=abdbad3bae84f665bada488f0e41d2e75b810e88fa63b64e884856f8a9b8785c From 43232acc00dd9bcd5d58120099b86f0a8a946146 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 19 Jan 2022 16:31:16 +0100 Subject: [PATCH 20/49] samplv1: update to 0.9.24. --- srcpkgs/samplv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template index 34835b18bb7b..c694da880baf 100644 --- a/srcpkgs/samplv1/template +++ b/srcpkgs/samplv1/template @@ -1,6 +1,6 @@ # Template file for 'samplv1' pkgname=samplv1 -version=0.9.23 +version=0.9.24 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://samplv1.sourceforge.io/" changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/samplv1/samplv1-${version}.tar.gz" -checksum=78903a8b11f6d16bfe703d82286a269dcc9f278b5fa4e2f752b4de0a46f9fead +checksum=ff0bfbaacfb514cb1a0194b0a43ca121f7679640a293f907fb1bbb2640d373b0 From a0364ce612c78deda1a40be7270529e1c46dcae6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 19 Jan 2022 16:31:20 +0100 Subject: [PATCH 21/49] synthv1: update to 0.9.24. --- srcpkgs/synthv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template index 839e2f1dd69d..e835002bd2fc 100644 --- a/srcpkgs/synthv1/template +++ b/srcpkgs/synthv1/template @@ -1,6 +1,6 @@ # Template file for 'synthv1' pkgname=synthv1 -version=0.9.23 +version=0.9.24 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later" homepage="https://synthv1.sourceforge.io/" changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/synthv1/synthv1-${version}.tar.gz" -checksum=d15ef64f9d62713fedf5f25fe26c1c31864b8f34cf9e68826d4f817709c29b0e +checksum=74857bf2497023dd0ebe59222e548d870598312b18a5826c54f4033c0fbd3d55 From b457eb62e712af6a73c3fa8a434badad7160e93b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 19 Jan 2022 16:40:06 +0100 Subject: [PATCH 22/49] flatpak: update to 1.12.4. --- srcpkgs/flatpak/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index e41207c5e914..3949c2bbbce2 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,6 +1,6 @@ # Template file for 'flatpak' pkgname=flatpak -version=1.12.3 +version=1.12.4 revision=1 build_style=gnu-configure build_helper="gir" @@ -23,7 +23,7 @@ license="LGPL-2.1-or-later" homepage="https://flatpak.org/" changelog="https://github.com/flatpak/flatpak/raw/master/NEWS" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" -checksum=d715f23347d7eb859301c8f0c778a899bb7c9e26dac6ae2a2a4b9fc21cf77b69 +checksum=792e6265f7f6d71b2a087028472a048287bed2587e43d2eec2c31d360c16211c build_options="gir" build_options_default="gir" From e8987518785a465e6f45163e14e0c8543f484c41 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 7 Jan 2022 00:58:14 +0100 Subject: [PATCH 23/49] talloc: update to 2.3.3 --- srcpkgs/talloc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template index dc22f69cee13..da77f999c27b 100644 --- a/srcpkgs/talloc/template +++ b/srcpkgs/talloc/template @@ -1,7 +1,7 @@ # Template file for 'talloc' pkgname=talloc -version=2.3.2 -revision=2 +version=2.3.3 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -14,8 +14,8 @@ short_desc="Hierarchical pool based memory allocator with destructors" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://talloc.samba.org/" -distfiles="http://samba.org/ftp/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=27a03ef99e384d779124df755deb229cd1761f945eca6d200e8cfd9bf5297bd7 +distfiles="https://download.samba.org/pub/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" From de457dcb905468927a29f60aac5410a77d971443 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 7 Jan 2022 01:04:44 +0100 Subject: [PATCH 24/49] tevent: update to 0.11.0 --- srcpkgs/tevent/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/tevent/template b/srcpkgs/tevent/template index 1d05c275ebd2..89b67625d473 100644 --- a/srcpkgs/tevent/template +++ b/srcpkgs/tevent/template @@ -1,7 +1,7 @@ # Template file for 'tevent' pkgname=tevent -version=0.10.2 -revision=3 +version=0.11.0 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -9,13 +9,13 @@ configure_args="--sysconfdir=/etc --localstatedir=/var --disable-rpath --disable-rpath-install --without-gettext --builtin-libraries=replace --bundled-libraries=NONE" hostmakedepends="pkg-config docbook2x" -makedepends="python3-devel talloc-devel libxslt gettext-devel" +makedepends="python3-devel talloc-devel libxslt gettext-devel cmocka-devel" short_desc="Event system based on the talloc memory management library" maintainer="Yuusha Spacewolf " license="GPL-3.0-or-later" homepage="https://tevent.samba.org" -distfiles="https://ftp.samba.org/pub/tevent/tevent-${version}.tar.gz" -checksum=f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696 +distfiles="https://download.samba.org/pub/tevent/tevent-${version}.tar.gz" +checksum=ee9a86c8e808aac2fe1e924eaa139ff7f0269d0e8e4fafa850ae5c7489bc82ba export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" From 6ed38f05290007adcd3d1ae342299b636b92390b Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 7 Jan 2022 01:14:15 +0100 Subject: [PATCH 25/49] tdb: update to 1.4.5 --- srcpkgs/tdb/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index a542437b9699..0b00f4364bf3 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -1,7 +1,7 @@ # Template file for 'tdb' pkgname=tdb -version=1.4.3 -revision=2 +version=1.4.5 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -14,8 +14,8 @@ short_desc="Trivial Database, similar to GDBM but allows simultaneous commits" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://tdb.samba.org/" -distfiles="http://samba.org/ftp/tdb/tdb-${version}.tar.gz" -checksum=c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b +distfiles="https://download.samba.org/pub/tdb/tdb-${version}.tar.gz" +checksum=bcfced884f7031080998b5c4b1c5dce57567055f79417f86dba40dcde99a0e41 export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" From 348445971cb255c22f142e8349df4d346f29d289 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 7 Jan 2022 01:19:40 +0100 Subject: [PATCH 26/49] ldb: update to 2.3.2 --- srcpkgs/ldb/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ldb/template b/srcpkgs/ldb/template index 6bcb57c6ba24..a5e2c1978dd1 100644 --- a/srcpkgs/ldb/template +++ b/srcpkgs/ldb/template @@ -1,7 +1,7 @@ # Template file for 'ldb' pkgname=ldb -version=2.3.0 -revision=2 +version=2.3.2 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -17,8 +17,8 @@ short_desc="LDAP-like database from samba" maintainer="Yuusha Spacewolf " license="LGPL-3.0-or-later" homepage="https://www.samba.org/ldb/" -distfiles="https://www.samba.org/ftp/pub/ldb/ldb-${version}.tar.gz" -checksum=a4d308b3d0922ef01f3661a69ebc373e772374defa76cf0979ad21b21f91922d +distfiles="https://download.samba.org/pub/ldb/ldb-${version}.tar.gz" +checksum=1416c949dc4326e41c0d8a5ecf8ef784f8c0b6e9d3dad8fa971e84ad56227603 # workaround for cmocka's broken uintptr_t definition on musl if [ "$XBPS_TARGET_WORDSIZE" = "64" -a "$XBPS_TARGET_LIBC" = "musl" ]; then From c34031d5c490ae8e8191e7283d93e24b3736e910 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 7 Jan 2022 01:52:41 +0100 Subject: [PATCH 27/49] samba: update to 4.14.11 Closes: #34916 [via git-merge-pr] --- srcpkgs/samba/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index ed234d824364..2e5e1a0cbb20 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba -version=4.14.7 -revision=2 +version=4.14.11 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -26,8 +26,8 @@ short_desc="SMB/CIFS file, print, and login server for Unix" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.samba.org" -distfiles="http://download.samba.org/pub/samba/stable/${pkgname}-${version}.tar.gz" -checksum=6f50353f9602aa20245eb18ceb00e7e5ec793df0974aebd5254c38f16d8f1906 +distfiles="https://download.samba.org/pub/samba/stable/${pkgname}-${version}.tar.gz" +checksum=3d9ebbf3280c7cf5eac1b15aeff8857b31151abaec4d2987be015a66c2945d98 lib32disabled=yes conf_files="/etc/pam.d/samba /etc/samba/smb.conf" make_dirs="/etc/samba/private 0750 root root" @@ -48,9 +48,9 @@ fi _privlibs="CHARSET3 MESSAGING_SEND MESSAGING LIBWBCLIENT_OLD addns ads \ asn1util auth authkrb5 cmdline_contexts cmdline-credentials cli_cldap \ cli-ldap-common cli-nbt cli_smb_common cli_spoolss clidns common-auth \ - ctdb-event-client dbwrap events genrand gensec gse http interfaces \ - krb5samba ldbsamba libcli_lsa3 libcli_netlogon3 libsmb messages_dgm \ - messages_util mscat msghdr msrpc3 netif npa_tstream popt_samba3 \ + ctdb-event-client dbwrap dcerpc-pkt-auth events genrand gensec gse http \ + interfaces krb5samba ldbsamba libcli_lsa3 libcli_netlogon3 libsmb \ + messages_dgm messages_util mscat msghdr msrpc3 netif npa_tstream popt_samba3 \ popt_samba3_cmdline registry replace samba-cluster-support samba-debug \ samba-modules samba-security samba-sockets samba3-util samdb-common secrets3 \ server_id_db server-role smbclient-raw smbd_shim socket-blocking sys_rw \ From f76eb4240609a02239132319f841a882a66f7ffe Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 19 Jan 2022 17:12:30 +0100 Subject: [PATCH 28/49] wine: update to 7.0. --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 8 ++++---- srcpkgs/wine/patches/musl-uid-t.patch | 4 ++-- srcpkgs/wine/template | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index 61933a038174..ec53bea46b76 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.0-rc6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.0-rc6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 +--- a/wine-7.0/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 ++++ b/wine-7.0/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 @@ -29,7 +29,8 @@ #include #include diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch index c4f80deb7db8..1f8b6f029078 100644 --- a/srcpkgs/wine/patches/musl-rpath.patch +++ b/srcpkgs/wine/patches/musl-rpath.patch @@ -1,7 +1,7 @@ diff --git a/configure b/configure index 774a95ce003..d408e77cc78 100755 ---- a/wine-7.0-rc6/configure -+++ b/wine-7.0-rc6/configure +--- a/wine-7.0/configure ++++ b/wine-7.0/configure @@ -11137,6 +11137,38 @@ fi LIBWINE_DEPENDS="wine.map" @@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755 diff --git a/configure.ac b/configure.ac index 8c5066a3de6..01ede86df1e 100644 ---- a/wine-7.0-rc6/configure.ac -+++ b/wine-7.0-rc6/configure.ac +--- a/wine-7.0/configure.ac ++++ b/wine-7.0/configure.ac @@ -916,6 +916,9 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch index 197df6d584bf..82a9e8aade31 100644 --- a/srcpkgs/wine/patches/musl-uid-t.patch +++ b/srcpkgs/wine/patches/musl-uid-t.patch @@ -1,5 +1,5 @@ ---- a/wine-7.0-rc6/server/security.h 2021-10-12 19:52:55.876645306 +0200 -+++ b/wine-7.0-rc6/server/security.h 2021-10-12 19:53:08.605490926 +0200 +--- a/wine-7.0/server/security.h 2021-10-12 19:52:55.876645306 +0200 ++++ b/wine-7.0/server/security.h 2021-10-12 19:53:08.605490926 +0200 @@ -21,6 +21,8 @@ #ifndef __WINE_SERVER_SECURITY_H #define __WINE_SERVER_SECURITY_H diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index df8810b62c5f..76057d020f62 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.0rc6 +version=7.0 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%r*}/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="63155081508b974d24654f26edb02878b2089096748d14a0e9d7cda453c27b50 - ea3069210075dbb4672b342190b7f6b85fe0c5d607e21427d9709f7c8c3bf2d6" +checksum="5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b + ff5eb5d3ca17953b75a0b1792313e2402338905a03d8d8e6d5fad186a0644740" build_options="mingw staging" build_options_default="mingw" From d2fd4728b931a7e2ae0ca75b90ea38027c2e757b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 19 Jan 2022 19:09:21 +0100 Subject: [PATCH 29/49] extrace: update to 0.9. --- srcpkgs/extrace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template index e3b98977791f..5d80d129fb15 100644 --- a/srcpkgs/extrace/template +++ b/srcpkgs/extrace/template @@ -1,6 +1,6 @@ # Template file for 'extrace' pkgname=extrace -version=0.8 +version=0.9 revision=1 build_style=gnu-makefile depends="libcap-progs" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later, BSD-2-Clause" homepage="https://github.com/leahneukirchen/extrace" distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz" -checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb +checksum=e488db1126bd941e5a094e6024c3975f70abfa7ad51a3451191d1518c0b35ced post_install() { vlicense LICENSE From aef7995b86d812fd2f286c3deda8d3446adcf049 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 19 Jan 2022 19:11:07 +0100 Subject: [PATCH 30/49] digikam: update to 7.5.0. --- srcpkgs/digikam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index a9061514cbd7..2d5bed8e1a8f 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,6 +1,6 @@ # Template file for 'digikam' pkgname=digikam -version=7.4.0 +version=7.5.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -21,7 +21,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=d08ab66da732bb449bc10106ec11dd9defa5b3562ded3741b041dbbaa715504a +checksum=cc143dcdba0ab138036d78cd80b29d5cfd32bceb2c3e74e46b363a661dfca780 CXXFLAGS="-Wl,-lpthread" From c32f21c9d6576d877b9b5cd8753aa28cf3b82862 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 19 Jan 2022 19:13:37 +0100 Subject: [PATCH 31/49] linux5.4: update to 5.4.172. --- srcpkgs/linux5.4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 4cc9c26ed2cf..331801c26271 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -1,6 +1,6 @@ # Template file for 'linux5.4' pkgname=linux5.4 -version=5.4.171 +version=5.4.172 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=afbcc8ed7d85485af299567f307b03057ffff3ec7bee02a21c33933d435b4958 +checksum=b19e890b67e8293008262d3518cab47be58462c63da43f2c9832d63644886ce4 python_version=3 nodebug=yes # -dbg package is generated below manually From e8c1159ae6c35587d3ff84e8094baa0160ab46ad Mon Sep 17 00:00:00 2001 From: Alex Diaconu Date: Sun, 16 Jan 2022 23:16:26 +0200 Subject: [PATCH 32/49] nicotine+: update to 3.2.0. Since python3-setuptools is now a build dependency, python3 can be dropped. xvfb is required to test the package. Also slightly adjusted the package description to match the official one. --- srcpkgs/nicotine+/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template index 039e1d7ffc1e..ed78d9d6a5e4 100644 --- a/srcpkgs/nicotine+/template +++ b/srcpkgs/nicotine+/template @@ -1,15 +1,16 @@ # Template file for 'nicotine+' pkgname=nicotine+ -version=3.1.1 +version=3.2.0 revision=1 wrksrc="nicotine-plus-${version}" build_style=python3-module -hostmakedepends="python3 gettext" +hostmakedepends="python3-setuptools gettext" depends="gspell gtk+3 python3-gobject" -short_desc="Graphical client for the Soulseek file sharing network" +checkdepends="$depends python3-pytest python3-pytest-xvfb" +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=d02f374eaf4cf8cebb2b4068ed5dd36f5774d5ea72b61715ff39bfd6936252d0 +checksum=ec3a90ca9a791e7724bbb6504defe0b4104a21dd7da3f20fdc7a50519f90228e From 4e3a7e13d46b53035570ff4dff12fdeb7022e8d3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 17 Jan 2022 19:51:54 +0100 Subject: [PATCH 33/49] python3-lazy-object-proxy: update to 1.7.1. --- srcpkgs/python3-lazy-object-proxy/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template index 1e3301dd1f4d..b11ee5175297 100644 --- a/srcpkgs/python3-lazy-object-proxy/template +++ b/srcpkgs/python3-lazy-object-proxy/template @@ -1,18 +1,20 @@ # Template file for 'python3-lazy-object-proxy' pkgname=python3-lazy-object-proxy -version=1.5.2 -revision=3 +version=1.7.1 +revision=1 wrksrc="lazy-object-proxy-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" depends="python3" short_desc="Fast and thorough lazy object proxy (Python3)" -maintainer="Orphaned " +maintainer="Michal Vasilek " license="BSD-2-Clause" homepage="https://github.com/ionelmc/python-lazy-object-proxy" +changelog="https://raw.githubusercontent.com/ionelmc/python-lazy-object-proxy/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz" -checksum=5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4 +checksum=d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4 +make_check=no # needs pytest-testpath and pytest-benchmark post_install() { vlicense LICENSE From a1a1208934ceff4c5b266076b921b035f5a0dc3f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 17 Jan 2022 19:52:02 +0100 Subject: [PATCH 34/49] python3-wrapt: update to 1.13.3. --- srcpkgs/python3-wrapt/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template index eb8aa61817cd..ada937b3688a 100644 --- a/srcpkgs/python3-wrapt/template +++ b/srcpkgs/python3-wrapt/template @@ -1,18 +1,20 @@ # Template file for 'python3-wrapt' pkgname=python3-wrapt -version=1.12.1 -revision=6 +version=1.13.3 +revision=1 wrksrc="wrapt-${version}" build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" depends="python3" +checkdepends="python3-pytest" short_desc="Python3 module for decorators, wrappers and monkey patching" -maintainer="Orphaned " +maintainer="Michal Vasilek " license="BSD-2-Clause" homepage="https://github.com/GrahamDumpleton/wrapt" +changelog="https://raw.githubusercontent.com/GrahamDumpleton/wrapt/develop/docs/changes.rst" distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz" -checksum=b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7 +checksum=1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185 post_install() { vlicense LICENSE From 1bcc025207c27d626c0a57bc99b8109a1e2fbd31 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 17 Jan 2022 19:52:06 +0100 Subject: [PATCH 35/49] python3-astroid: update to 2.9.3. --- srcpkgs/python3-astroid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index be93234e9037..4cfef4e92fd9 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,6 +1,6 @@ # Template file for 'python3-astroid' pkgname=python3-astroid -version=2.9.0 +version=2.9.3 revision=1 wrksrc="astroid-${version}" build_style=python3-module @@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/PyCQA/astroid" changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog" distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz" -checksum=35ceb3584637c7ad7c0238024ec8d4a7693f868238e03d37ae77975fdb45b76d +checksum=07234423c3722df6aa067c15f5fa60adf4f1d6ae659d2ab147acb40a8a1904f7 From c4cf8f73222f3e36d332b20386438e4e7a5c1345 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 17 Jan 2022 20:22:07 +0100 Subject: [PATCH 36/49] lagrange: update to 1.10.0. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index 036a6fb680e2..4977b5b7ee36 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.9.5 +version=1.10.0 revision=1 build_style=cmake hostmakedepends="pkg-config zip" @@ -12,7 +12,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=10d75283f1d235c2d8865ebb9ccba6b1b2821c44e9aa20a60619ab6c32f49ca0 +checksum=382c4880bd45d30b9ccd7bb6279b2f8f47db28b41700dbed45b8e4e4ef954f7f post_install() { vlicense LICENSE.md From e83efd6f7f6bdd21086f932050be84abf3fe069a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 17 Jan 2022 06:40:04 -0500 Subject: [PATCH 37/49] chezmoi: update to 2.10.0. --- srcpkgs/chezmoi/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 747ab1944418..7f7dd3e5469f 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,27 +1,24 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.9.5 +version=2.10.0 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" go_build_tags="noembeddocs noupgrade" go_ldflags="-X main.version=${version} -X main.commit=v${version} - -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps - -X github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/chezmoi" + -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps" short_desc="Manage your dotfiles across multiple machines, securely" -maintainer="Abigail G " +maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=10a27e4569c0cd6951a8509a39443f8a918d22d61db0026b78e88ef83fa43e04 +checksum=edd67d4e97d3a022a84968cd3828004767ea0ce7b141439cc9ffb4048519a0c2 export CGO_ENABLED=1 post_install() { vlicense LICENSE - for f in docs/*; do vdoc $f; done - vcompletion completions/chezmoi-completion.bash bash chezmoi vcompletion completions/chezmoi.fish fish chezmoi vcompletion completions/chezmoi.zsh zsh chezmoi From c3e2e8a0257578237cd4fc019431fa81dadcb204 Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 19 Jan 2022 12:07:23 -0700 Subject: [PATCH 38/49] procs: update to 0.12.0. --- srcpkgs/procs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template index fad24562d427..309ff8c6f5c9 100644 --- a/srcpkgs/procs/template +++ b/srcpkgs/procs/template @@ -1,6 +1,6 @@ # Template file for 'procs' pkgname=procs -version=0.11.13 +version=0.12.0 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=b769ddf1b2faeca4e9fb22e8e0248f5d69b4b88bd51fb37c8510d2e6a8e897d3 +checksum=04dbb3ddc734a9d1305b26b546a913e3e04d556b5863212a2675d29268aebed3 post_build() { PROCS="target/${RUST_TARGET}/release/procs" From 466b682c3f5e1141b8ce6dc06600dd04ce758be8 Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 19 Jan 2022 11:54:41 -0700 Subject: [PATCH 39/49] wlclock: update to 1.0.1. --- srcpkgs/wlclock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wlclock/template b/srcpkgs/wlclock/template index 1038d991dcf9..445acef7e2e3 100644 --- a/srcpkgs/wlclock/template +++ b/srcpkgs/wlclock/template @@ -1,6 +1,6 @@ # Template file for 'wlclock' pkgname=wlclock -version=1.0.0 +version=1.0.1 revision=1 wrksrc="${pkgname}-v${version}" build_style=meson @@ -11,4 +11,4 @@ maintainer="travankor " license="GPL-3.0-or-later" homepage="https://git.sr.ht/~leon_plickat/wlclock/" distfiles="https://git.sr.ht/~leon_plickat/wlclock/archive/v${version}.tar.gz" -checksum=e2f218e70378342c344e7afa43c4361e3308936a7afaf54a0cad9970267a4ff4 +checksum=df624174a07dc381773039c230252e3364abee81831069ce66a12970311accfa From 61ca41e21e454b9d66f9743d50ae2706c86ba545 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Mon, 17 Jan 2022 19:54:53 +0100 Subject: [PATCH 40/49] syncthing-gtk: restore translations --- srcpkgs/syncthing-gtk/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template index 0acef5a8c94c..336afea95255 100644 --- a/srcpkgs/syncthing-gtk/template +++ b/srcpkgs/syncthing-gtk/template @@ -2,9 +2,9 @@ pkgname=syncthing-gtk reverts="0.14.36_1" version=0.9.4.4+ds+git20220108+9023143f8b93 -revision=1 +revision=2 build_style=python3-module -hostmakedepends="python3-setuptools" +hostmakedepends="python3-setuptools gettext" depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt python3-cairo gtk+3 python3-gobject" short_desc="GTK based GUI for Syncthing" @@ -13,3 +13,7 @@ license="GPL-2.0-or-later" homepage="https://salsa.debian.org/debian/syncthing-gtk/" distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz" checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8 + +pre_configure() { + ./generate-locales.sh +} From 159176e5be371233d4ce4b8a71d114387faf1586 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 15 Jan 2022 12:06:05 +0200 Subject: [PATCH 41/49] cantarell-fonts: update to 0.303.1. --- srcpkgs/cantarell-fonts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template index e9ef2be85d80..897141490b57 100644 --- a/srcpkgs/cantarell-fonts/template +++ b/srcpkgs/cantarell-fonts/template @@ -1,6 +1,6 @@ # Template file for 'cantarell-fonts' pkgname=cantarell-fonts -version=0.301 +version=0.303.1 revision=1 build_style=meson configure_args="-Dfontsdir=/usr/share/fonts/cantarell -Duseprebuilt=true -Dbuildappstream=true" @@ -11,5 +11,5 @@ maintainer="Orphaned " license="OFL-1.1" homepage="https://wiki.gnome.org/Projects/CantarellFonts" changelog="https://gitlab.gnome.org/GNOME/cantarell-fonts/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83 +distfiles="${GNOME_SITE}/${pkgname}/${version:0:5}/${pkgname}-${version}.tar.xz" +checksum=f9463a0659c63e57e381fdd753cf1929225395c5b49135989424761830530411 From 5ef0f7a0463fb49f34bec84e9afe0e48e64400ae Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Wed, 29 Dec 2021 08:53:22 +1100 Subject: [PATCH 42/49] ImageMagick: update to 7.1.0.19. --- srcpkgs/ImageMagick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 356015153e80..1810efcaea22 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,6 +1,6 @@ # Template file for 'ImageMagick' pkgname=ImageMagick -version=7.1.0.15 +version=7.1.0.19 revision=1 _majorver=${version%.*} _patchver=${version##*.} @@ -20,7 +20,7 @@ license="ImageMagick" homepage="https://www.imagemagick.org" changelog="https://imagemagick.org/script/changelog.php" distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz" -checksum=0b0272b8bbdeb31b15c06f75764b93b22198453ef7fceabbc07655e90f3c73c2 +checksum=385ca5bd8ce9b37e685779c46868171af949265c9db40067c1c4d7442dbc723e subpackages="libmagick libmagick-devel" From 7bcb40bd948a7001a4212cda40fc7cb214a3b147 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 18 Jan 2022 09:03:40 -0600 Subject: [PATCH 43/49] Amass: update to 3.16.0. --- srcpkgs/Amass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template index 1141a36737e2..3b0d8963816a 100644 --- a/srcpkgs/Amass/template +++ b/srcpkgs/Amass/template @@ -1,6 +1,6 @@ # Template file for 'Amass' pkgname=Amass -version=3.15.2 +version=3.16.0 revision=1 build_style=go go_import_path="github.com/OWASP/Amass/v3/..." @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" -checksum=bdfb4c3492ebf46008f00910491381d2abee51a7322df6e978dd14e174ddf601 +checksum=80b8933783d66324129ca93b3135146ec8345e2d381db2092e9edefd75e55c50 post_install() { rm ${DESTDIR}/usr/bin/examples From ff6fea8bd3a1b663364060ea0c920ed5582a3350 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 18 Jan 2022 09:03:45 -0600 Subject: [PATCH 44/49] spotify-qt: update to 3.8. --- srcpkgs/spotify-qt/patches/disable-crash-handler.patch | 7 +++++-- srcpkgs/spotify-qt/template | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch index 7f6e063e34e0..4d5e61a5bde5 100644 --- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch +++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch @@ -1,12 +1,15 @@ --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -26,11 +26,6 @@ +@@ -26,14 +26,6 @@ # Version macros target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}") --# Check if using GCC for crash handler support +-# Check if using GCC -if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- # Used by crash handler - target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX) +- # Enable all compiler warnings +- target_compile_options(spotify-qt-lib PRIVATE -Wall -Wextra) -endif () - # Link optional libraries diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template index af3179dd2b91..0fb27d690f5d 100644 --- a/srcpkgs/spotify-qt/template +++ b/srcpkgs/spotify-qt/template @@ -1,6 +1,6 @@ # Template file for 'spotify-qt' pkgname=spotify-qt -version=3.7 +version=3.8 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-devel" @@ -10,4 +10,4 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://github.com/kraxarn/spotify-qt" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8 +checksum=deb12800b9fb4f501f8dfc97a2fdc4989849fe8bbf6f38d79503214e03afe5ad From 4148e5ce1c72873b29fb3eae68eb81b090adedff Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 19 Jan 2022 19:19:45 -0600 Subject: [PATCH 45/49] opencv4: -devel and libopencv-devel conflict --- srcpkgs/opencv4/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template index 69fec13d8f4b..595d8b2e22a9 100644 --- a/srcpkgs/opencv4/template +++ b/srcpkgs/opencv4/template @@ -1,7 +1,7 @@ # Template file for 'opencv4' pkgname=opencv4 version=4.5.3 -revision=1 +revision=2 wrksrc=opencv-${version} build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON @@ -62,6 +62,7 @@ libopencv4_package() { libopencv4-devel_package() { short_desc+=" - development files" depends="libopencv4>=${version}_${revision}" + conflicts="libopencv-devel>=0" pkg_install() { vmove usr/include vmove usr/lib/cmake From 62dcf2ad943a0c516094aba3c459e52cc55cc18f Mon Sep 17 00:00:00 2001 From: Savoy Date: Mon, 17 Jan 2022 17:11:34 -0600 Subject: [PATCH 46/49] lazygit: update to 0.32.2 --- srcpkgs/lazygit/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template index 06af62da62b6..437452933b36 100644 --- a/srcpkgs/lazygit/template +++ b/srcpkgs/lazygit/template @@ -1,18 +1,17 @@ # Template file for 'lazygit' pkgname=lazygit -version=0.31.4 +version=0.32.2 revision=1 build_style=go go_import_path=github.com/jesseduffield/lazygit go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux" -hostmakedepends="git" depends="git" short_desc="Simple terminal UI for git commands" maintainer="Nathan Owens " license="MIT" homepage="https://github.com/jesseduffield/lazygit" distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz" -checksum=584b04e5d5666f863bd742efcce5b8ec30095ff97fd7f6f887e94e94c6eac7d8 +checksum=44a735c4ee78838dc918e82bd5070b154600cd24992259fd698f2116a797012b post_install() { vlicense LICENSE From 3d0ea66c44e2bc492cef96275eeffef165255d09 Mon Sep 17 00:00:00 2001 From: Kamil Smardzewski Date: Sat, 15 Jan 2022 15:02:45 +0100 Subject: [PATCH 47/49] blueman: add libappindicator dependency for blueman-applet. --- srcpkgs/blueman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template index ff74f1751b09..ac029c2e23c9 100644 --- a/srcpkgs/blueman/template +++ b/srcpkgs/blueman/template @@ -1,13 +1,13 @@ # Template file for 'blueman' pkgname=blueman version=2.2.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="intltool iproute2 pkg-config python3-Cython" makedepends="gtk+3-devel libbluetooth-devel python3-devel python3-gobject-devel startup-notification-devel" -depends="bluez libnotify python3-gobject" +depends="bluez libnotify python3-gobject libappindicator" short_desc="GTK+ Bluetooth Manager" maintainer="Frank Steinborn " license="GPL-3.0-or-later" From ac5168a64ac8ff59c30d847270789f9897f4ff6b Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 19 Jan 2022 20:59:53 -0500 Subject: [PATCH 48/49] gnutls: update to 3.7.3. The 3.7.x branch is currently documented as "next", while 3.6.x is "stable". However, all distros, including Debian stable, use the 3.7.x branch; and other libraries and applications already require new functionality provided only in the 3.7 branch. Closes: #34742 [via git-merge-pr] --- srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch | 4 ++-- srcpkgs/gnutls/template | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch index 28fdf69446a9..17f0a62cf49b 100644 --- a/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch +++ b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch @@ -1,8 +1,8 @@ upstream: no reason: don't prompt for password, don't assume it has been asked for ---- a/tests/cert-tests/certtool -+++ b/tests/cert-tests/certtool +--- a/tests/cert-tests/certtool.sh ++++ b/tests/cert-tests/certtool.sh @@ -26,6 +26,7 @@ TMPFILE1=certtool-file1.$$.tmp TMPFILE2=certtool-file2.$$.tmp diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index 3f02c29d3b27..960a133cf248 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,9 +1,9 @@ # Template file for 'gnutls' pkgname=gnutls -version=3.6.16 +version=3.7.3 revision=1 build_style=gnu-configure -configure_args="--with-zlib --disable-guile --disable-static +configure_args="--disable-guile --disable-static --disable-valgrind-tests --disable-rpath --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib" @@ -13,7 +13,7 @@ hostmakedepends="gettext libtool pkg-config which" # dependencies listed in pkg-config files _develdepends="unbound-devel trousers-devel libunistring-devel nettle-devel libtasn1-devel libidn2-devel p11-kit-devel" -makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel +makedepends="lzo-devel readline-devel libgpg-error-devel libgcrypt-devel ${_develdepends}" checkdepends="iproute2" short_desc="GNU Transport Layer Security library" @@ -21,10 +21,10 @@ maintainer="Orphaned " license="GPL-3.0-only, LGPL-2.1-or-later" homepage="https://gnutls.org" distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" -checksum=1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3 +checksum=fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a pre_check() { - # same as $PASS in tests/cert-tests/certtool + # same as $PASS in tests/cert-tests/certtool.sh export GNUTLS_PIN=1234 } From 9802c338da7cd05ae079fd8b812e116aa106d835 Mon Sep 17 00:00:00 2001 From: boson-at Date: Tue, 11 Jan 2022 14:14:14 +0100 Subject: [PATCH 49/49] osm2pgsql: update to 1.5.2. --- srcpkgs/osm2pgsql/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template index 9698f63059b6..e0946e9c56f3 100644 --- a/srcpkgs/osm2pgsql/template +++ b/srcpkgs/osm2pgsql/template @@ -1,14 +1,14 @@ # Template file for 'osm2pgsql' pkgname=osm2pgsql -version=1.5.1 +version=1.5.2 revision=1 build_style=cmake -hostmakedepends="boost python3 python3-psycopg2" +hostmakedepends="boost" makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel - postgresql-libs-devel lua52-devel" + postgresql-libs-devel lua53-devel" short_desc="Tool for loading OpenStreetMap data into a PostgreSQL database" maintainer="Nýx " license="GPL-3.0-or-later" homepage="https://osm2pgsql.org" distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz" -checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e +checksum=4af0b925180ead2710eb68af28f70c91a81fb21dde5f80659d78e9fd14cf52cc