upg libinput feh python-setuptools
This commit is contained in:
parent
0d087b11de
commit
7d2e5017a8
29
feh/PKGBUILD
29
feh/PKGBUILD
|
|
@ -1,12 +1,13 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=feh
|
||||
pkgver=3.8
|
||||
pkgrel=02
|
||||
pkgver=3.9
|
||||
pkgrel=01
|
||||
pkgdesc='Fast and light imlib2-based image viewer'
|
||||
url='https://feh.finalrewind.org/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -15,13 +16,14 @@ depends=('curl' 'file' 'imlib2' 'libexif' 'libxinerama')
|
|||
optdepends=('imagemagick: support more file formats'
|
||||
'jpegexiforient: set exif rotation tag')
|
||||
makedepends=('libxt')
|
||||
source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc}
|
||||
'0001-libmagic.patch')
|
||||
source=(${url}$pkgname-$pkgver.tar.bz2{,.asc})
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -Np1 < ../0001-libmagic.patch
|
||||
}
|
||||
# '0001-libmagic.patch')
|
||||
|
||||
#prepare() {
|
||||
# cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
# patch -Np1 < ../0001-libmagic.patch
|
||||
#}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
|
@ -29,6 +31,7 @@ build() {
|
|||
exif=1 \
|
||||
help=1 \
|
||||
inotify=1 \
|
||||
magic=1 \
|
||||
stat64=1
|
||||
}
|
||||
|
||||
|
|
@ -45,6 +48,8 @@ license=('custom:MIT')
|
|||
|
||||
validpgpkeys=('781BB7071C6BF648EAEB08A1100D5BFB5166E005')
|
||||
|
||||
sha256sums=(7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9 # feh-3.8.tar.bz2
|
||||
7941a7eecadc55f0ccab2b9eec9aca37288eff8efe19056021ea339fb260e824 # feh-3.8.tar.bz2.asc
|
||||
cc2c7ca77c710001339cceb78225119e910bc6949ab2a3380b90caf84c0d3e41) # 0001-libmagic.patch
|
||||
sha256sums=(8649962c41d2c7ec4cc3f438eb327638a1820ad5a66df6a9995964601ae6bca0 # feh-3.9.tar.bz2
|
||||
f8b7366c2175c53e581059a06d04cb484419dd8e499136127b7564c8b446a996) # feh-3.9.tar.bz2.asc
|
||||
# cc2c7ca77c710001339cceb78225119e910bc6949ab2a3380b90caf84c0d3e41) # 0001-libmagic.patch
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
|
||||
|
||||
pkgname=feh
|
||||
pkgver=3.8
|
||||
pkgrel=2
|
||||
pkgver=3.9
|
||||
pkgrel=1
|
||||
pkgdesc='Fast and light imlib2-based image viewer'
|
||||
url='https://feh.finalrewind.org/'
|
||||
license=('custom:MIT')
|
||||
|
|
@ -15,16 +15,9 @@ optdepends=('imagemagick: support more file formats'
|
|||
'jpegexiforient: set exif rotation tag')
|
||||
makedepends=('libxt')
|
||||
validpgpkeys=('781BB7071C6BF648EAEB08A1100D5BFB5166E005')
|
||||
source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc}
|
||||
'0001-libmagic.patch')
|
||||
sha256sums=('7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9'
|
||||
'SKIP'
|
||||
'cc2c7ca77c710001339cceb78225119e910bc6949ab2a3380b90caf84c0d3e41')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -Np1 < ../0001-libmagic.patch
|
||||
}
|
||||
source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc})
|
||||
sha256sums=('8649962c41d2c7ec4cc3f438eb327638a1820ad5a66df6a9995964601ae6bca0'
|
||||
'SKIP')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
|
@ -32,6 +25,7 @@ build() {
|
|||
exif=1 \
|
||||
help=1 \
|
||||
inotify=1 \
|
||||
magic=1 \
|
||||
stat64=1
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=libinput
|
||||
pkgver=1.20.1
|
||||
pkgver=1.21.0
|
||||
pkgrel=01
|
||||
pkgdesc="Input device management and event handling library"
|
||||
pkgdesc="Input device management and event handling library - unsigned source"
|
||||
#url="https://www.freedesktop.org/wiki/Software/libinput/"
|
||||
url="https://gitlab.freedesktop.org/libinput"
|
||||
arch=(x86_64)
|
||||
|
|
@ -20,9 +20,13 @@ optdepends=('gtk4: libinput debug-gui'
|
|||
'python-libevdev: libinput measure')
|
||||
#source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
|
||||
#source=($url/libinput/-/archive/$pkgver/$pkgname-$pkgver{,.sig}.tar.bz2) # .tar.bz2 #
|
||||
source=($url/libinput/-/archive/$pkgver/$pkgname-$pkgver.tar.bz2)
|
||||
#source=(https://gitlab.freedesktop.org/libinput/libinput/-/archive/$pkgver/$pkgname-$pkgver.tar.bz2)
|
||||
# Arch is using a source that during June 12th-13th was down, the entire site, not just the link.
|
||||
# The sum reported for this tar ball does not match to this of the alternative site (common for freedesktop tar balls)
|
||||
# and no signature file is provided to check the validity of the source.
|
||||
#
|
||||
source=(https://github.com/wayland-project/libinput/archive/refs/tags/$pkgver.tar.gz)
|
||||
|
||||
# -D tests=false \
|
||||
build() {
|
||||
arch-meson $pkgname-$pkgver build \
|
||||
-D udev-dir=/usr/lib/udev \
|
||||
|
|
@ -51,7 +55,4 @@ license=(custom:X11)
|
|||
|
||||
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
|
||||
|
||||
# d20ec6a007cf068ddb7bcbfe839bc0d4b19be8b8dae9ce11672326df49920a08) # libinput-1.20.0.sig.tar.bz2
|
||||
sha512sums=('d981bf90980c2f609393da998926bc4018599dddbb86c272dfb77bab1b2d5f35c6070f96bcfe5ef0032bd6c957b13f64ed32025d9f04fb413268571b2ee79cd1')
|
||||
|
||||
sha256sums=(08c003f724f361ed21f4dfbfe755a6c115b85385f1418907bb98f185457273f0) # libinput-1.20.1.tar.bz2
|
||||
sha256sums=(1b23c180f5b297303ed36f5a549910f5d320b0eb21052eac67a966d4eaa4e01d) # libinput-1.21.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
pkgname=libinput
|
||||
pkgver=1.20.1
|
||||
pkgver=1.21.0
|
||||
pkgrel=1
|
||||
pkgdesc="Input device management and event handling library"
|
||||
url="https://gitlab.freedesktop.org/libinput"
|
||||
|
|
@ -15,10 +15,7 @@ optdepends=('gtk4: libinput debug-gui'
|
|||
'python-libevdev: libinput measure')
|
||||
options=(debug)
|
||||
source=(https://gitlab.freedesktop.org/libinput/libinput/-/archive/$pkgver/$pkgname-$pkgver.tar.bz2)
|
||||
sha512sums=('d981bf90980c2f609393da998926bc4018599dddbb86c272dfb77bab1b2d5f35c6070f96bcfe5ef0032bd6c957b13f64ed32025d9f04fb413268571b2ee79cd1')
|
||||
#source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
|
||||
#sha512sums=('f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298'
|
||||
# 'SKIP')
|
||||
sha256sums=('3173d83e0f5a686606d2780129c802b865b6a0750c86db88d56097afc016a2dd')
|
||||
#validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
rm -rvf {pkg,src,libinput-1.*}
|
||||
rm -rvf {pkg,src,1.*tar.gz*}
|
||||
|
|
|
|||
|
|
@ -8,3 +8,5 @@ cmake
|
|||
gtk4
|
||||
check
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=python-setuptools
|
||||
pkgver=61.2.0
|
||||
pkgver=61.3.0
|
||||
pkgrel=01
|
||||
epoch=1
|
||||
pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
|
||||
|
|
@ -31,7 +31,7 @@ prepare() {
|
|||
|
||||
patch -p1 -i ../system-validate-pyproject.patch
|
||||
|
||||
rm -r {pkg_resources,setuptools}/{extern,_vendor}
|
||||
rm -r {pkg_resources,setuptools}/{extern,_vendor} setuptools/config/_validate_pyproject
|
||||
|
||||
# Upstream devendoring logic is badly broken, see:
|
||||
# https://bugs.archlinux.org/task/58670
|
||||
|
|
@ -64,28 +64,23 @@ build() {
|
|||
python setup.py build
|
||||
}
|
||||
|
||||
## 14 tests fail on this Arch build, this is the 3rd build in a week, who knows
|
||||
## what tweaks they must have done so it passes through their container ...
|
||||
## most likely there will be a few more takes before this is fully functional again
|
||||
## So we skip the check all together for this time
|
||||
#
|
||||
#check() { (
|
||||
# # Workaround UTF-8 tests by setting LC_CTYPE
|
||||
# export LC_CTYPE=en_US.UTF-8
|
||||
#
|
||||
# # https://github.com/pypa/setuptools/pull/810
|
||||
# export PYTHONDONTWRITEBYTECODE=1
|
||||
#
|
||||
# cd setuptools-$pkgver
|
||||
# SETUPTOOLS_USE_DISTUTILS=stdlib python -m pytest \
|
||||
# --deselect setuptools/tests/test_distutils_adoption.py \
|
||||
# --deselect setuptools/tests/integration/test_pip_install_sdist.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[__import__('setuptools').setup()]" \
|
||||
# --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
|
||||
# --deselect setuptools/tests/config/test_pyprojecttoml.py::test_invalid_example
|
||||
#)}
|
||||
check() { (
|
||||
# Workaround UTF-8 tests by setting LC_CTYPE
|
||||
export LC_CTYPE=en_US.UTF-8
|
||||
|
||||
# https://github.com/pypa/setuptools/pull/810
|
||||
export PYTHONDONTWRITEBYTECODE=1
|
||||
|
||||
cd setuptools-$pkgver
|
||||
SETUPTOOLS_USE_DISTUTILS=stdlib python -m pytest \
|
||||
--deselect setuptools/tests/test_distutils_adoption.py \
|
||||
--deselect setuptools/tests/integration/test_pip_install_sdist.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[__import__('setuptools').setup()]" \
|
||||
--deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
|
||||
--deselect setuptools/tests/config/test_pyprojecttoml.py::test_invalid_example
|
||||
)}
|
||||
|
||||
package() {
|
||||
cd setuptools-$pkgver
|
||||
|
|
@ -96,6 +91,6 @@ package() {
|
|||
|
||||
license=('PSF')
|
||||
|
||||
sha256sums=(d49b2733d0ebf4cfbe5e87a9e73020a3e674f28b5064ccda79ee89270313343e # python-setuptools-61.2.0.tar.gz
|
||||
86af4e168a76402af4df65801f6a756f4953ddc7ffc79f1845966772fd13ee1e) # system-validate-pyproject.patch
|
||||
sha256sums=(63bb2671c3a4dd67949e9c8ff46aa06939c91d960e562cba68498a7ffb992b0a # python-setuptools-61.3.0.tar.gz
|
||||
3fffbffa0d0116ab64cb1e0e9b33ea28c60147c8f4fdbcfe71fac2adcfedd14a) # system-validate-pyproject.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Eli Schwartz <eschwartz@archlinux.org>
|
||||
|
||||
pkgname=python-setuptools
|
||||
pkgver=61.2.0
|
||||
pkgver=61.3.0
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
|
||||
|
|
@ -22,8 +22,8 @@ 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=('eec787039223a65849bb68c9ea2ddcb4a3502420b09db03be0845c85eed88aefe2cde9e478020142bb2ecb90b54c37790c4ae26a648bbb3b43e002dea2ac925b'
|
||||
'678c1f4bfc012c5615691433b9e329a4dd363c2b31e70620ce073bab3efe925437bf6f41c12ad48a8042e37ea6f8f7a25198afa482680ebd1505c0fc5bc30927')
|
||||
sha512sums=('35e2b848cf79e577b8c469562cb68a80b27d42d2d9c1c94f84fea9beb85e2db0796ed64d414add67a404d801c4f4e6cd489a72153de4dc8ed8b45fab24c28fd9'
|
||||
'50495062093b1b6902484c384abe073896e4f45c5768741582e178014367f186831711a72a8a987e7bacafe96d871161fc07c686dd92c6886de19302f6a10b56')
|
||||
|
||||
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ prepare() {
|
|||
|
||||
patch -p1 -i ../system-validate-pyproject.patch
|
||||
|
||||
rm -r {pkg_resources,setuptools}/{extern,_vendor}
|
||||
rm -r {pkg_resources,setuptools}/{extern,_vendor} setuptools/config/_validate_pyproject
|
||||
|
||||
# Upstream devendoring logic is badly broken, see:
|
||||
# https://bugs.archlinux.org/task/58670
|
||||
|
|
|
|||
|
|
@ -24,3 +24,5 @@ python-sphinx
|
|||
python-build
|
||||
python-ini2toml
|
||||
python-tomli-w
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,31 @@
|
|||
diff --git a/setuptools/config/pyprojecttoml.py b/setuptools/config/pyprojecttoml.py
|
||||
index bc76b111..886c9747 100644
|
||||
index d4024956..2c3bd6bf 100644
|
||||
--- a/setuptools/config/pyprojecttoml.py
|
||||
+++ b/setuptools/config/pyprojecttoml.py
|
||||
@@ -26,10 +26,14 @@ def load_file(filepath: _Path) -> dict:
|
||||
@@ -27,16 +27,22 @@ def load_file(filepath: _Path) -> dict:
|
||||
|
||||
|
||||
def validate(config: dict, filepath: _Path):
|
||||
- from setuptools.extern._validate_pyproject import validate as _validate
|
||||
+ import validate_pyproject.api, validate_pyproject.cli, validate_pyproject.plugins
|
||||
def validate(config: dict, filepath: _Path) -> bool:
|
||||
- from . import _validate_pyproject as validator
|
||||
+ import validate_pyproject.api, validate_pyproject.errors, validate_pyproject.cli, validate_pyproject.plugins
|
||||
|
||||
- trove_classifier = validator.FORMAT_FUNCTIONS.get("trove-classifier")
|
||||
+ trove_classifier = validate_pyproject.api.FORMAT_FUNCTIONS.get("trove-classifier")
|
||||
if hasattr(trove_classifier, "_disable_download"):
|
||||
# Improve reproducibility by default. See issue 31 for validate-pyproject.
|
||||
trove_classifier._disable_download() # type: ignore
|
||||
|
||||
+ plugins = validate_pyproject.plugins.list_from_entry_points()
|
||||
+ validator = validate_pyproject.api.Validator(
|
||||
+ validate_pyproject.cli.select_plugins(plugins, ('setuptools', 'distutils'), ())
|
||||
+ validate_pyproject.cli.select_plugins(plugins, ('setuptools', 'distutils'), ()),
|
||||
+ validate_pyproject.api.FORMAT_FUNCTIONS,
|
||||
+ )
|
||||
|
||||
+
|
||||
try:
|
||||
- return _validate(config)
|
||||
- return validator.validate(config)
|
||||
- except validator.ValidationError as ex:
|
||||
+ return validator(config)
|
||||
except Exception as ex:
|
||||
if ex.__class__.__name__ != "ValidationError":
|
||||
# Workaround for the fact that `extern` can duplicate imports
|
||||
+ except validate_pyproject.errors.ValidationError as ex:
|
||||
_logger.error(f"configuration error: {ex.summary}") # type: ignore
|
||||
_logger.debug(ex.details) # type: ignore
|
||||
error = ValueError(f"invalid pyproject.toml config: {ex.name}") # type: ignore
|
||||
|
|
|
|||
Loading…
Reference in New Issue