From 147b34966330f3c54e23275d6642a48db8256299 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Thu, 3 Nov 2022 05:37:23 +0200 Subject: [PATCH] upg libcms2 python-setuptools strace --- lcms2/PKGBUILD | 8 +++--- lcms2/PKGBUILD-arch | 4 +-- lcms2/deps | 1 + python-setuptools/PKGBUILD | 44 +++++++++++++++++++-------------- python-setuptools/PKGBUILD-arch | 39 ++++++++++++++++------------- python-setuptools/time | 6 ++--- strace/PKGBUILD | 7 +++--- strace/PKGBUILD-arch | 4 +-- strace/deps | 1 - 9 files changed, 63 insertions(+), 51 deletions(-) diff --git a/lcms2/PKGBUILD b/lcms2/PKGBUILD index 464c307..5db67dc 100644 --- a/lcms2/PKGBUILD +++ b/lcms2/PKGBUILD @@ -1,11 +1,12 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=lcms2 -pkgver=2.13.1 +pkgver=2.14 pkgrel=01 pkgdesc='Small-footprint color management engine, version 2' arch=('x86_64') @@ -39,4 +40,5 @@ package() { license=('MIT') -sha256sums=(d473e796e7b27c5af01bd6d1552d42b45b43457e7182ce9903f38bb748203b88) # lcms2-2.13.1.tar.gz +sha256sums=(28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740) # lcms2-2.14.tar.gz + diff --git a/lcms2/PKGBUILD-arch b/lcms2/PKGBUILD-arch index 6e560f1..e72bc46 100644 --- a/lcms2/PKGBUILD-arch +++ b/lcms2/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: Eric Bélanger pkgname=lcms2 -pkgver=2.13.1 +pkgver=2.14 pkgrel=1 pkgdesc='Small-footprint color management engine, version 2' arch=('x86_64') @@ -10,7 +10,7 @@ license=('MIT') depends=('libtiff') provides=('liblcms2.so') source=("https://github.com/mm2/Little-CMS/releases/download/lcms${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha256sums=('d473e796e7b27c5af01bd6d1552d42b45b43457e7182ce9903f38bb748203b88') +sha256sums=('28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740') build() { cd "${pkgname}-${pkgver}" diff --git a/lcms2/deps b/lcms2/deps index 2322cc2..bbfe5e3 100644 --- a/lcms2/deps +++ b/lcms2/deps @@ -1,2 +1,3 @@ libtiff + diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD index fe37888..6d0c2a0 100644 --- a/python-setuptools/PKGBUILD +++ b/python-setuptools/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=python-setuptools -pkgver=63.4.3 +pkgver=64.0.0 pkgrel=01 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -50,6 +50,11 @@ prepare() { done + # Fix tests invoking python-build + sed -e 's/"-m", "build", "--wheel"/"-m", "build", "--wheel", "--no-isolation"/' \ + -e 's/"-m", "build", "--sdist"/"-m", "build", "--sdist", "--no-isolation"/' \ + -i setuptools/tests/fixtures.py + # Remove post-release tag since we are using stable tags sed -e '/tag_build = .post/d' \ -e '/tag_date = 1/d' \ @@ -72,24 +77,22 @@ check() { ( export PYTHONDONTWRITEBYTECODE=1 cd setuptools-$pkgver - # 1-7: skipping all tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter) - # 8-9: subtle difference introduced by devendoring - # 10-12: TODO - - PRE_BUILT_SETUPTOOLS_SDIST="$PWD"/build/lib python -m pytest \ - --deselect setuptools/tests/integration/test_pip_install_sdist.py \ - --deselect setuptools/tests/test_distutils_adoption.py \ - --deselect setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests \ - --deselect setuptools/tests/test_virtualenv.py \ - --deselect setuptools/tests/test_editable_install.py::test_editable_with_pyproject \ - --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist \ - --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel \ + # 1: subtle difference introduced by devendoring + # rest: skipping broken tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter) + # and fails with pip + PYTHONPATH="$PWD"/build/lib python -m pytest \ --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \ - --deselect setuptools/tests/config/test_pyprojecttoml.py::test_invalid_example \ - --deselect setuptools/tests/test_dist_info.py::TestWheelCompatibility \ - --deselect setuptools/tests/test_dist_info.py::TestDistInfo::test_invalid_version \ - --deselect setuptools/tests/test_build.py - + --deselect setuptools/tests/test_build_meta.py::test_legacy_editable_install \ + --deselect setuptools/tests/test_distutils_adoption.py::test_distutils_local_with_setuptools \ + --deselect setuptools/tests/test_editable_install.py::test_editable_with_pyproject \ + --deselect setuptools/tests/test_editable_install.py::test_editable_with_flat_layout \ + --deselect setuptools/tests/test_editable_install.py::TestLegacyNamespaces::test_namespace_package_importable \ + --deselect setuptools/tests/test_editable_install.py::TestPep420Namespaces::test_namespace_package_importable \ + --deselect setuptools/tests/test_editable_install.py::TestPep420Namespaces::test_namespace_created_via_package_dir \ + --deselect setuptools/tests/test_editable_install.py::TestOverallBehaviour::test_editable_install \ + --deselect setuptools/tests/test_editable_install.py::TestLinkTree::test_strict_install \ + --deselect setuptools/tests/test_editable_install.py::test_compat_install \ + --deselect setuptools/tests/test_virtualenv.py )} package() { @@ -101,7 +104,10 @@ package() { license=('PSF') -sha256sums=(e103616bd2d6c0d14ecbf3922bde31c6dbcda5b0e8c688ad670bc62f8e36f23a # python-setuptools-63.4.3.tar.gz +sha256sums=(c50b0d7a9fab992abc7c83473d8b9d9282514d992539456826cac79853d4c3ca # python-setuptools-64.0.0.tar.gz 06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb) # system-validate-pyproject.patch +sha512sums=('efc15a423215443e05a9e6a778b8ff910f0a982a814899f20f7599b6bf7213e11effaae2725548e5c52874d3c9de5be7964f4d1155e7df48ccf990b64fcff246' + '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a') + diff --git a/python-setuptools/PKGBUILD-arch b/python-setuptools/PKGBUILD-arch index c804896..363de38 100644 --- a/python-setuptools/PKGBUILD-arch +++ b/python-setuptools/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Eli Schwartz pkgname=python-setuptools -pkgver=63.4.3 +pkgver=64.0.0 pkgrel=1 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -21,7 +21,7 @@ provides=('python-distribute') replaces=('python-distribute') source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz" system-validate-pyproject.patch) -sha512sums=('039b72fc8b62c3dc27edb856c5c0f1fe01ccf813c2a5a446baf163c4560a6b819b309056681da9f811609b1e44c4787d4f0e18b2550428df19e9c24e790ade90' +sha512sums=('efc15a423215443e05a9e6a778b8ff910f0a982a814899f20f7599b6bf7213e11effaae2725548e5c52874d3c9de5be7964f4d1155e7df48ccf990b64fcff246' '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a') export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 @@ -49,6 +49,11 @@ prepare() { {} + done + # Fix tests invoking python-build + sed -e 's/"-m", "build", "--wheel"/"-m", "build", "--wheel", "--no-isolation"/' \ + -e 's/"-m", "build", "--sdist"/"-m", "build", "--sdist", "--no-isolation"/' \ + -i setuptools/tests/fixtures.py + # Remove post-release tag since we are using stable tags sed -e '/tag_build = .post/d' \ -e '/tag_date = 1/d' \ @@ -71,22 +76,22 @@ check() { ( export PYTHONDONTWRITEBYTECODE=1 cd setuptools-$pkgver - # 1-7: skipping all tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter) - # 8-9: subtle difference introduced by devendoring - # 10-12: TODO - PRE_BUILT_SETUPTOOLS_SDIST="$PWD"/build/lib python -m pytest \ - --deselect setuptools/tests/integration/test_pip_install_sdist.py \ - --deselect setuptools/tests/test_distutils_adoption.py \ - --deselect setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests \ - --deselect setuptools/tests/test_virtualenv.py \ - --deselect setuptools/tests/test_editable_install.py::test_editable_with_pyproject \ - --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist \ - --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel \ + # 1: subtle difference introduced by devendoring + # rest: skipping broken tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter) + # and fails with pip + PYTHONPATH="$PWD"/build/lib python -m pytest \ --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \ - --deselect setuptools/tests/config/test_pyprojecttoml.py::test_invalid_example \ - --deselect setuptools/tests/test_dist_info.py::TestWheelCompatibility \ - --deselect setuptools/tests/test_dist_info.py::TestDistInfo::test_invalid_version \ - --deselect setuptools/tests/test_build.py + --deselect setuptools/tests/test_build_meta.py::test_legacy_editable_install \ + --deselect setuptools/tests/test_distutils_adoption.py::test_distutils_local_with_setuptools \ + --deselect setuptools/tests/test_editable_install.py::test_editable_with_pyproject \ + --deselect setuptools/tests/test_editable_install.py::test_editable_with_flat_layout \ + --deselect setuptools/tests/test_editable_install.py::TestLegacyNamespaces::test_namespace_package_importable \ + --deselect setuptools/tests/test_editable_install.py::TestPep420Namespaces::test_namespace_package_importable \ + --deselect setuptools/tests/test_editable_install.py::TestPep420Namespaces::test_namespace_created_via_package_dir \ + --deselect setuptools/tests/test_editable_install.py::TestOverallBehaviour::test_editable_install \ + --deselect setuptools/tests/test_editable_install.py::TestLinkTree::test_strict_install \ + --deselect setuptools/tests/test_editable_install.py::test_compat_install \ + --deselect setuptools/tests/test_virtualenv.py )} package() { diff --git a/python-setuptools/time b/python-setuptools/time index 6dd3cc5..a8068ab 100644 --- a/python-setuptools/time +++ b/python-setuptools/time @@ -1,6 +1,6 @@ -real 2m11.132s -user 1m53.908s -sys 0m11.978s +real 3m14.663s +user 2m51.517s +sys 0m16.241s diff --git a/strace/PKGBUILD b/strace/PKGBUILD index 17a9bda..00e939a 100644 --- a/strace/PKGBUILD +++ b/strace/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=strace -pkgver=5.19 +pkgver=6.0 pkgrel=01 pkgdesc='A diagnostic, debugging and instructional userspace tracer' arch=(x86_64) @@ -38,6 +38,5 @@ license=(BSD) validpgpkeys=('296D6F29A020808E8717A8842DB5BD89A340AEB7') # Dmitry V. Levin -sha256sums=(aa3dc1c8e60e4f6ff3d396514aa247f3c7bf719d8a8dc4dd4fa793be786beca3 # strace-5.19.tar.xz - a5fbe83da7b4b4045f48fea0d0cf70f88087f5f2809fd7170545989b4a100765) # strace-5.19.tar.xz.asc - +sha256sums=(92d720a666855e9f1c6a11512fd6e99674a82bbfe1442557815f2ce8e1293338 # strace-6.0.tar.xz + cf9b4922340bfcbc9f58af10350d9c4156aadd57bac45cca1481f6facdb6ae1c) # strace-6.0.tar.xz.asc diff --git a/strace/PKGBUILD-arch b/strace/PKGBUILD-arch index fbb1e23..13f4a66 100644 --- a/strace/PKGBUILD-arch +++ b/strace/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Tom Newsom pkgname=strace -pkgver=5.19 +pkgver=6.0 pkgrel=1 pkgdesc='A diagnostic, debugging and instructional userspace tracer' arch=(x86_64) @@ -10,7 +10,7 @@ url='https://strace.io/' license=(BSD) depends=(perl libunwind) source=(https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz{,.asc}) -sha1sums=('dc34c0d7c3ab0d0adb227f751c016da2c415eb2e' +sha1sums=('6ac0fb07dbeb29a79e17d81f735aacb326a72c28' 'SKIP') validpgpkeys=('296D6F29A020808E8717A8842DB5BD89A340AEB7') # Dmitry V. Levin diff --git a/strace/deps b/strace/deps index 0d1d550..f3c2395 100644 --- a/strace/deps +++ b/strace/deps @@ -1,4 +1,3 @@ libunwind -