upg cython ell mpd multipath-tools python-setuptools refind pcsclite qt5-base wlroots

add wlroots0.16

cython/PKGBUILD

@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=cython
-pkgver=3.0.5
+pkgver=3.0.6
 pkgrel=01
 pkgdesc='C-Extensions for Python'
 url='https://cython.org'
@@ -62,7 +62,6 @@ arch=(x86_64)
 
 license=(APACHE)
 
-sha256sums=(28eafb657bf3f2f8d78eb7948ebb089be31e51ec76119d84925347c4dea68b59)  # cython-3.0.5.tar.gz
-
-##  76c0a6be23e624c8f16a4a49369117cffabe025be319567c67c090b4387a2b6b  cython-3.0.5-01-x86_64.pkg.tar.lz
+sha256sums=(79d1b2f9e4d94c9d1e306d2d8ddef6759fa933363f8a90fa3be7b500db0287d9)  # cython-3.0.6.tar.gz
 
+##  b4082c448e7254bd876d9f61b00f4ea3c75d86de469d7c9a48d5bd5880578d6d  cython-3.0.6-01-x86_64.pkg.tar.lz

cython/PKGBUILD-arch

@@ -3,7 +3,7 @@
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=cython
-pkgver=3.0.5
+pkgver=3.0.6
 pkgrel=1
 pkgdesc='C-Extensions for Python'
 arch=(x86_64)
@@ -20,7 +20,7 @@ checkdepends=(gdb
               python-numpy
               python-pytest)
 source=(https://github.com/cython/cython/archive/$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('28eafb657bf3f2f8d78eb7948ebb089be31e51ec76119d84925347c4dea68b59')
+sha256sums=('79d1b2f9e4d94c9d1e306d2d8ddef6759fa933363f8a90fa3be7b500db0287d9')
 
 build() {
   cd cython-$pkgver

ell/PKGBUILD

@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=ell
-pkgver=0.60
+pkgver=0.61
 pkgrel=01
 pkgdesc="Embedded Linux library"
 url="https://01.org/ell"
@@ -41,9 +41,8 @@ license=('LGPL2.1')
 
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # "Marcel Holtmann <marcel@holtmann.org>"
 
-sha256sums=(61cec2df694b548e51afa3e7ffd1e1ad31a9fea7bedb93a3a3cc60894390c70f  # ell-0.60.tar.xz
-	0eef6502b41eb69dd24dcad71759f24bc2c274eef5cbf40496a1830faba3761d) # ell-0.60.tar.sign
+sha256sums=(c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0  # ell-0.61.tar.xz
+	cbdc6801fa13c578163ebe0307e0eb4b51fc572ddb9b31d8aabf714aae7c4c6a) # ell-0.61.tar.sign
 
-
-##  1d88407dbeaf51a6f0a64cf79c4066cf7383bf96453d1faab336927c7c533919  ell-0.60-01-x86_64.pkg.tar.lz
+##  40a106abf86e073351cb50cbd0ad7f0c531931f760a08ddd51e814759982dc14  ell-0.61-01-x86_64.pkg.tar.lz
 

ell/PKGBUILD-arch

@@ -2,7 +2,7 @@
 # Contributor: Jameson Pugh <imntreal@gmail.com>
 
 pkgname=ell
-pkgver=0.60
+pkgver=0.61
 pkgrel=1
 pkgdesc="Embedded Linux library"
 arch=(x86_64)
@@ -13,7 +13,7 @@ depends=('gcc-libs' 'glibc')
 checkdepends=('dbus' 'procps-ng')
 # https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc
 source=(https://mirrors.edge.kernel.org/pub/linux/libs/$pkgname/$pkgname-$pkgver.tar.{xz,sign})
-sha256sums=('61cec2df694b548e51afa3e7ffd1e1ad31a9fea7bedb93a3a3cc60894390c70f'
+sha256sums=('c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0'
             'SKIP')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # "Marcel Holtmann <marcel@holtmann.org>"
 

mpd/PKGBUILD

@@ -7,7 +7,7 @@
 
 pkgname=mpd
 pkgver=0.23.14
-pkgrel=01
+pkgrel=02
 pkgdesc="Flexible, powerful, server-side application for playing music w/o systemd"
 url="https://www.musicpd.org/"
 depends=(bzip2 chromaprint gcc-libs glibc hicolor-icon-theme lame libcdio libcdio-paranoia
@@ -26,8 +26,13 @@ source=(
   $pkgname.sysusers
   $pkgname.tmpfiles
 #  $pkgname.service.override
+  $pkgname-0.23.14-ffmpeg6.1.patch  # backport of https://github.com/MusicPlayerDaemon/MPD/commit/50c1e3738a672f933560247b5527d365d17b1c02.patch
 )
 
+prepare() {
+  patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.14-ffmpeg6.1.patch
+}
+
 build() {
   local _meson_options=(
     -D documentation=enabled
@@ -83,7 +88,8 @@ sha256sums=(85b9a67426d528ae9fb849eb3b10faf52d4b18d22b1fd71088e6d9a388b509d2  #
 	938ae47b7d5e71db2adeb5a183b17ba9ea4b44b039878802f10654bf647f28f5  # mpd-0.23.14.tar.xz.sig
 	f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03  # mpd.conf
 	0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6  # mpd.sysusers
-	2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a) # mpd.tmpfiles
+	2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a  # mpd.tmpfiles
+	dc694c6eb9843d3e6574afb4ef28adadcbc1eda3a09476f330075ba457a48ec9) # mpd-0.23.14-ffmpeg6.1.patch
+
+##  ff76c1b95f543d612fdcebf461e6a3e60bae4a8d31a849fc173fa748f2de569c  mpd-0.23.14-02-x86_64.pkg.tar.lz
 
- 
-##  bf40b697a7f69455e68d4069e8657c37bb639c596718b855ab48562409a0deec  mpd-0.23.14-01-x86_64.pkg.tar.lz

mpd/PKGBUILD-arch

@@ -8,7 +8,7 @@
 
 pkgname=mpd
 pkgver=0.23.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Flexible, powerful, server-side application for playing music"
 arch=(x86_64)
 url="https://www.musicpd.org/"
@@ -87,21 +87,28 @@ source=(
   $pkgname.sysusers
   $pkgname.tmpfiles
   $pkgname.service.override
+  $pkgname-0.23.14-ffmpeg6.1.patch  # backport of https://github.com/MusicPlayerDaemon/MPD/commit/50c1e3738a672f933560247b5527d365d17b1c02.patch
 )
 sha512sums=('4d97b22c37ca8c0939830cd6497023d868005a123f866db594716027c590e2d1dffb65bbd3af41404dcc7c0249466192e457ae1ba80f1f95ff044516be4c99ae'
             'SKIP'
             '25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1'
             '6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18'
             'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d'
-            'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c')
+            'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c'
+            'b3ed83f321df78a88f4f11be28262e6204e80132cab1242a5f2c3cddb9d0e1a9172d0feef41e287b7706f40218b5b1ed69877a14b0394b52e8e59b512d3b66ef')
 b2sums=('c048f128111d1d65775c317182b91d113339a5b09d3005c320cc3b14a79b7c1da0d1ba3d53f6bf348a3a404ceea33c1ad2427225f4a1f3d1cde4a921e71d6e1c'
         'SKIP'
         '0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
         '4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
         'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a'
-        '753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513')
+        '753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513'
+        'd4223d1e84bafd7af79d7b2e5409b8590f300e104896c5b4bda2b56d3c103b617487969ab0a484a70628fb23fc363b476090b26eac46d00c5a798429baf0124a')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max@blarg.de>
 
+prepare() {
+  patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.14-ffmpeg6.1.patch
+}
+
 build() {
   local _meson_options=(
     -D documentation=enabled

mpd/deps

@@ -45,5 +45,6 @@ python-sphinx
 twolame
 libgit2
 hicolor-icon-theme
+libglvnd
 
 

mpd/mpd-0.23.14-ffmpeg6.1.patch

@@ -0,0 +1,14 @@
+diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
+index 5b5c8b40e3..3c3323ce8a 100644
+--- a/src/decoder/plugins/FfmpegIo.cxx
++++ b/src/decoder/plugins/FfmpegIo.cxx
+@@ -26,6 +26,9 @@
+ 
+ extern "C" {
+ #include <libavutil/mem.h>
++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100)
++#include <libavutil/error.h>
++#endif
+ }
+ 
+ AvioStream::~AvioStream()

multipath-tools/PKGBUILD

@@ -8,7 +8,7 @@
 pkgname=multipath-tools
 _tag='6bb7330fca4a85c4f5abab0f9de5bd3519923f0a' # git rev-parse ${pkgver}
 pkgver=0.9.7
-pkgrel=01
+pkgrel=04
 pkgdesc='Multipath tools for Linux (including kpartx) w/o systemd'
 #url='http://christophe.varoqui.free.fr/'
 url='https://github.com/opensvc/multipath-tools'
@@ -57,5 +57,5 @@ license=(GPL2)
 
 sha256sums=(SKIP)
 
-##  6eeb84744d04b2067a182f8dc13e056e9057567251078f0af31b2319e6d46dc0  multipath-tools-0.9.7-01-x86_64.pkg.tar.lz
+##  06989e4fde2df2092ccb9885a2c4bacc76dc921411a401ff2e4abe3a0034729a  multipath-tools-0.9.7-04-x86_64.pkg.tar.lz
 

multipath-tools/PKGBUILD-arch

@@ -10,7 +10,7 @@
 pkgname=multipath-tools
 _tag='6bb7330fca4a85c4f5abab0f9de5bd3519923f0a' # git rev-parse ${pkgver}
 pkgver=0.9.7
-pkgrel=1
+pkgrel=4
 pkgdesc='Multipath tools for Linux (including kpartx)'
 arch=('x86_64')
 url='https://github.com/opensvc/multipath-tools'
@@ -20,13 +20,21 @@ makedepends=('git' 'systemd')
 source=("multipath-tools::git+https://github.com/opensvc/multipath-tools#tag=${_tag}")
 sha256sums=('SKIP')
 
+_make_opts=(
+  prefix='/usr/'
+  bindir='/usr/bin'
+  etc_prefix=""
+  configfile='/etc/multipath.conf'
+  statedir='/etc/multipath'
+  LIB='lib'
+)
+
+
 build() {
   cd "${pkgname}"
 
   make \
-    prefix='/usr/' \
-    bindir='/usr/bin' \
-    LIB='lib' \
+    "${_make_opts[@]}" \
     FORTIFY_OPT=''
 }
 
@@ -34,10 +42,8 @@ package() {
   cd "${pkgname}"
 
   make -j1 \
+    "${_make_opts[@]}" \
     DESTDIR="${pkgdir}" \
-    prefix='/usr/' \
-    bindir='/usr/bin' \
-    LIB='lib' \
     install
 
   install -D -m0644 -t "${pkgdir}/usr/share/doc/${pkgname}" README*

multipath-tools/deps

@@ -4,4 +4,3 @@ liburcu
 git
 
 
-

pcsclite/PKGBUILD

@@ -7,7 +7,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=pcsclite
-pkgver=2.0.0
+pkgver=2.0.1
 pkgrel=01
 pkgdesc="PC/SC Architecture smartcard middleware library w/o systemd"
 url='https://pcsclite.apdu.fr/'
@@ -57,7 +57,8 @@ license=('BSD')
 
 validpgpkeys=('F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E') # Ludovic Rousseau <rousseau@debian.org>
 
-sha256sums=(d6c3e2b64510e5ed6fcd3323febf2cc2a8e5fda5a6588c7671f2d77f9f189356  # pcsc-lite-2.0.0.tar.bz2
-	8ee817108e132bdd7c17c0d0ab8ca8e9477ad51587ee660dc19822434c21f175) # pcsc-lite-2.0.0.tar.bz2.asc
+sha256sums=(5edcaf5d4544403bdab6ee2b5d6c02c6f97ea64eebf0825b8d0fa61ba417dada  # pcsc-lite-2.0.1.tar.bz2
+	fc3fb65dc557ce1559cc1db32cdecafed78b732f0a038fe392c5198e1769af08) # pcsc-lite-2.0.1.tar.bz2.asc
+
+##  966dd0634e10c8cebb7220cb62d8c00b59f49d0744d1c3dcc2bd6384bed4cd09  pcsclite-2.0.1-01-x86_64.pkg.tar.lz
 
-##  1f3bbac44c4c4bb5f7bace74f1a9f46aed1627cac6c71c811a9d7f4f147ce90b  pcsclite-2.0.0-01-x86_64.pkg.tar.lz

pcsclite/PKGBUILD-arch

@@ -4,7 +4,7 @@
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=2.0.0
+pkgver=2.0.1
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('x86_64')
@@ -19,7 +19,7 @@ optdepends=(
 provides=('libpcsclite.so' 'libpcscspy.so')
 validpgpkeys=('F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E') # Ludovic Rousseau <rousseau@debian.org>
 source=("https://pcsclite.apdu.fr/files/pcsc-lite-${pkgver}.tar.bz2"{,.asc})
-sha256sums=('d6c3e2b64510e5ed6fcd3323febf2cc2a8e5fda5a6588c7671f2d77f9f189356'
+sha256sums=('5edcaf5d4544403bdab6ee2b5d6c02c6f97ea64eebf0825b8d0fa61ba417dada'
             'SKIP')
 
 build() {

python-setuptools/PKGBUILD

@@ -6,14 +6,12 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=python-setuptools
-pkgver=68.0.0
-_commit=49fec9fafb0e23e0dde52d3c4c410d23a2de9b0d
+pkgver=68.1.1
+_commit=5f14368eb20068e58f6d8524efc0ae70082afa89
 pkgrel=01
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 url="https://pypi.org/project/setuptools/"
-#depends=('python-appdirs' 'python-jaraco.text' 'python-more-itertools' 'python-ordered-set'
-#         'python-packaging' 'python-pyparsing' 'python-tomli' 'python-validate-pyproject')
 depends=('python-jaraco.text' 'python-more-itertools' 'python-ordered-set' 'python-packaging'
          'python-platformdirs' 'python-tomli' 'python-validate-pyproject')
 makedepends=('git' 'python-setuptools')
@@ -25,8 +23,9 @@ provides=('python-distribute')
 replaces=('python-distribute')
 #source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz"
 source=("git+https://github.com/pypa/setuptools.git#commit=$_commit"
-        system-validate-pyproject.patch)
-#        add-dependency.patch)
+	system-validate-pyproject.patch
+	add-dependency.patch
+	build-no-isolation.patch)
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 
 prepare() {
@@ -54,12 +53,12 @@ prepare() {
   done
 
   # Add the devendored dependencies into metadata of setuptools
-#  patch -p1 -i ../add-dependency.patch
-
+  patch -p1 -i ../add-dependency.patch
   # 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
+  patch -p1 -i ../build-no-isolation.patch
+#  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' \
@@ -76,11 +75,29 @@ build() {
   python setup.py build
 }
 
-# a few tests may fail when building outside a container, comment this check section out,
-# and rerun without using the -f option on makepkg ... Hopefully the tests failures will
-# vanish in the expected multiple Arch releases of this pkg.
-# 68.0.0
-# ======== 30 failed, 1070 passed, 28 skipped, 32 deselected, 6 xfailed, 1 xpassed in 262.83s (0:04:22) ========
+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
+  cd setuptools
+  # 1,4: subtle difference introduced by devendoring
+  # rest: skipping broken tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter)
+  #       and fails with pip
+  # 2: pip failures related to devendoring, 
+  # 3,5: TODO
+  # 6: jaraco.develop is not packaged
+  PYTHONPATH="$PWD"/build/lib python -m pytest \
+    --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
+    --deselect setuptools/tests/test_virtualenv.py \
+    --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix \
+    --deselect setuptools/_normalization.py::setuptools._normalization.safe_version \
+    --deselect setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_honors_fetch_params \
+    --ignore tools/finalize.py
+)}
 
 #check() { (
 #  # Workaround UTF-8 tests by setting LC_CTYPE
@@ -96,13 +113,14 @@ build() {
 #  #       and fails with pip
 #  # 2: pip failures related to devendoring, 
 #  # 3,5: TODO
+#  # 6: jaraco.develop is not packaged
 #  PYTHONPATH="$PWD"/build/lib python -m pytest \
 #    --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
 #    --deselect setuptools/tests/test_virtualenv.py \
 #    --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix \
 #    --deselect setuptools/_normalization.py::setuptools._normalization.safe_version \
-#    --deselect setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_honors_fetch_params
-#
+#    --deselect setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_honors_fetch_params \
+#    --ignore tools/finalize.py
 #)}
 
 package() {
@@ -118,14 +136,14 @@ arch=(x86_64)
 license=('PSF')
 
 sha256sums=(SKIP
-	06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb)  # system-validate-pyproject.patch
-#	a2bc8b9d470c13b4cb682ab3943e80ab2841aae98f7c3d9ba1f089408f96aa91) #  add-dependency.patch
-
-##  d016a64e6596b2f00945f3408483f1e15c35f223afbc1c076896fadf230e6edb  python-setuptools-1:68.0.0-01-x86_64.pkg.tar.lz
-
+	06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb  # system-validate-pyproject.patch
+	a2bc8b9d470c13b4cb682ab3943e80ab2841aae98f7c3d9ba1f089408f96aa91  #  add-dependency.patch
+	583ddbc8b636d47c57706a82317ae9956207db9418a1498324b43733a1732860) # build-no-isolation.patch
 
 # Note to packager: 
 ls -l *pkg.tar.lz 
 echo "you must rename this package to meet SF naming before you move to the repo"
-mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
+echo "mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log"
 
+
+##  650b900abc681feaffe99da7251e6337f86c36cce41f03419cbfa539b2719f59  python-setuptools-1_68.1.1-01-x86_64.pkg.tar.lz

python-setuptools/PKGBUILD-arch

@@ -3,8 +3,8 @@
 # Contributor: Eli Schwartz <eschwartz@archlinux.org>
 
 pkgname=python-setuptools
-pkgver=68.0.0
-_commit=49fec9fafb0e23e0dde52d3c4c410d23a2de9b0d
+pkgver=68.1.1
+_commit=5f14368eb20068e58f6d8524efc0ae70082afa89
 pkgrel=1
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
@@ -22,10 +22,12 @@ provides=('python-distribute')
 replaces=('python-distribute')
 source=("git+https://github.com/pypa/setuptools.git#commit=$_commit"
         system-validate-pyproject.patch
-        add-dependency.patch)
+        add-dependency.patch
+        build-no-isolation.patch)
 sha512sums=('SKIP'
             '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a'
-            '9c5d80c753e78bf613572fb789a234984087d0ce96d0bad22b5ed731d83c77bf6d8acfa65c78f6c78f9063be7819c2b58988fdf8e7fc89b55339f94a87b3b21f')
+            '9c5d80c753e78bf613572fb789a234984087d0ce96d0bad22b5ed731d83c77bf6d8acfa65c78f6c78f9063be7819c2b58988fdf8e7fc89b55339f94a87b3b21f'
+            '5b03349d09a6f1caff65684e746d3598f14172c3f4bd54981600598895baf08ba5cfaa3b0616af8ba0c1de607ca14cca8233358e5e34a7b9478f2522c0153ad5')
 
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 
@@ -56,9 +58,7 @@ prepare() {
   patch -p1 -i ../add-dependency.patch
 
   # 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
+  patch -p1 -i ../build-no-isolation.patch
 
   # Remove post-release tag since we are using stable tags
   sed -e '/tag_build = .post/d' \
@@ -85,12 +85,14 @@ check() { (
   # 1,4: subtle difference introduced by devendoring
   # 2: pip failures related to devendoring, 
   # 3,5: TODO
+  # 6: jaraco.develop is not packaged
   PYTHONPATH="$PWD"/build/lib python -m pytest \
     --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
     --deselect setuptools/tests/test_virtualenv.py \
     --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix \
     --deselect setuptools/_normalization.py::setuptools._normalization.safe_version \
-    --deselect setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_honors_fetch_params
+    --deselect setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_honors_fetch_params \
+    --ignore tools/finalize.py
 )}
 
 package() {

python-setuptools/build-no-isolation.patch

@@ -0,0 +1,20 @@
+diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
+index 524c6cbd2..90d82e7c7 100644
+--- a/setuptools/tests/fixtures.py
++++ b/setuptools/tests/fixtures.py
+@@ -82,6 +82,7 @@ def setuptools_sdist(tmp_path_factory, request):
+                 "-m",
+                 "build",
+                 "--sdist",
++                "--no-isolation",
+                 "--outdir",
+                 str(tmp),
+                 str(request.config.rootdir),
+@@ -108,6 +109,7 @@ def setuptools_wheel(tmp_path_factory, request):
+                 "-m",
+                 "build",
+                 "--wheel",
++                "--no-isolation",
+                 "--outdir",
+                 str(tmp),
+                 str(request.config.rootdir),

python-setuptools/time

@@ -1,6 +1,5 @@
 
-
-real	8m7.111s
-user	5m37.901s
-sys	0m26.948s
+real	6m37.653s
+user	5m45.090s
+sys	0m27.054s
  

qt5-base/PKGBUILD

@@ -8,8 +8,8 @@
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 _basever=5.15.11
-pkgver=5.15.11+kde+r146
-_commit=28ec5c9b28cf76e078882f4fef03d6cf9595d025
+pkgver=5.15.11+kde+r147
+_commit=56faf7249c3857f80f6483c5070e7408c2d53961
 pkgrel=01
 url='https://www.qt.io'
 pkgdesc='A cross-platform application and UI framework w/o systemd'
@@ -129,6 +129,6 @@ sha256sums=(SKIP
 	5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78  # qmake-cflags.patch
 	4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch
 
-##  85969ad58e3c470d7ac136b4abadcb4ee8505eeef660d04bbf62caa1b1ce32a4  qt5-base-5.15.11+kde+r146-01-x86_64.pkg.tar.lz
-##  e783832de91b587b0248640cc682402828879947333070f29eb271f5de950546  qt5-xcb-private-headers-5.15.11+kde+r146-01-x86_64.pkg.tar.lz
+##  ac9ffefe55e25155887a5bc4d1828d5729632860617a93468865c37167fe2c24  qt5-base-5.15.11+kde+r147-01-x86_64.pkg.tar.lz
+##  6d2fe8895c22aac21fc38526391dcd8102e6d13411462eaf7a0f2cd46bc12d7b  qt5-xcb-private-headers-5.15.11+kde+r147-01-x86_64.pkg.tar.lz
 

qt5-base/PKGBUILD-arch

@@ -4,9 +4,9 @@
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 _basever=5.15.11
-pkgver=5.15.11+kde+r146
+pkgver=5.15.11+kde+r147
 pkgrel=1
-_commit=28ec5c9b28cf76e078882f4fef03d6cf9595d025
+_commit=56faf7249c3857f80f6483c5070e7408c2d53961
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')

refind/PKGBUILD

@@ -9,7 +9,7 @@
 #pkgname=(refind refind-docs)
 pkgname=refind
 pkgver=0.14.0.2
-pkgrel=01
+pkgrel=02
 pkgdesc="An EFI boot manager"
 url="https://www.rodsbooks.com/refind/"
 makedepends=(bash dosfstools efibootmgr gnu-efi)
@@ -83,7 +83,7 @@ package() {
 
 #package_refind-docs() {
 #  pkgdesc+=" - documentation"
-#  license=(FDL1.3)
+#  license=(FDL-1.3-or-later)
 #
 #  cd $pkgbase-$pkgver
 #  install -vDm 644 docs/$pkgbase/*.{html,png,svg,txt} -t "$pkgdir/usr/share/doc/$pkgbase/html/"
@@ -95,10 +95,19 @@ package() {
 
 arch=(any)
 
-license=(BSD CCPL GPL2 GPL3 LGPL3)
+#license=(BSD CCPL GPL2 GPL3 LGPL3)
+  license=(
+    BSD-2-Clause
+    CC-BY-SA-3.0
+    CC-BY-SA-4.0
+    GPL-2.0-only
+    GPL-2.0-or-later
+    GPL-3.0-or-later
+    LGPL-2.1-or-later
+    'LGPL-3.0-or-later OR CC-BY-SA-3.0'
+  )
 
 sha256sums=(26a0c55dfd3565499e1f82d8fe57464dbef19ca886ce6d01a815228b8efc8b0f) # refind-src-0.14.0.2.tar.gz
 
-##  c8fb2c34f89d61ce9d37b0d6929587a4f4d1abdbb260fc9591afde3a8821ad2e  refind-0.14.0.2-01-any.pkg.tar.lz
-
+##  f7fa1944c4b1235744d00f23cee40049f3310b2b6b7b69326ab401b555382232  refind-0.14.0.2-02-any.pkg.tar.lz
 

refind/PKGBUILD-arch

@@ -3,11 +3,16 @@
 pkgbase=refind
 pkgname=(refind refind-docs)
 pkgver=0.14.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An EFI boot manager"
-arch=(any)
+arch=(x86_64)  # we build architecture-specific EFI binaries
 url="https://www.rodsbooks.com/refind/"
-makedepends=(bash dosfstools efibootmgr gnu-efi)
+makedepends=(
+  bash
+  dosfstools
+  efibootmgr
+  gnu-efi
+)
 source=(https://sourceforge.net/projects/refind/files/$pkgver/$pkgname-src-$pkgver.tar.gz)
 sha512sums=('41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e')
 b2sums=('02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a')
@@ -32,8 +37,21 @@ build() {
 }
 
 package_refind() {
-  license=(BSD CCPL GPL2 GPL3 LGPL3)
-  depends=(bash dosfstools efibootmgr)
+  license=(
+    BSD-2-Clause
+    CC-BY-SA-3.0
+    CC-BY-SA-4.0
+    GPL-2.0-only
+    GPL-2.0-or-later
+    GPL-3.0-or-later
+    LGPL-2.1-or-later
+    'LGPL-3.0-or-later OR CC-BY-SA-3.0'
+  )
+  depends=(
+    bash
+    dosfstools
+    efibootmgr
+  )
   optdepends=(
     'gptfdisk: for finding non-vfat ESP with refind-install'
     'imagemagick: for refind-mkfont'
@@ -78,7 +96,7 @@ package_refind() {
 
 package_refind-docs() {
   pkgdesc+=" - documentation"
-  license=(FDL1.3)
+  license=(FDL-1.3-or-later)
 
   cd $pkgbase-$pkgver
   install -vDm 644 docs/$pkgbase/*.{html,png,svg,txt} -t "$pkgdir/usr/share/doc/$pkgbase/html/"

wlroots/PKGBUILD

@@ -7,7 +7,7 @@
 
 pkgname=wlroots
 pkgver=0.17.0
-pkgrel=01
+pkgrel=03
 pkgdesc='Modular Wayland compositor library'
 url='https://gitlab.freedesktop.org/wlroots/wlroots'
 depends=(
@@ -29,7 +29,7 @@ depends=(
     'xcb-util-wm'
 )
 makedepends=('glslang' 'meson' 'ninja' 'vulkan-headers' 'wayland-protocols' 'xorg-xwayland'
-	'libliftoff' 'cmake' 'cairo')
+	 'cmake' 'cairo')
 optdepends=('xorg-xwayland: Xwayland support')
 provides=('libwlroots.so')
 # options=(debug)
@@ -59,5 +59,5 @@ validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48'  # Simon Ser
 sha256sums=(9da3475a6834a6a9a8fd93de84f4ef91f9ee48ff70c305aa9522bf0db9e61128  # wlroots-0.17.0.tar.gz
 	e8e5404ea71112ce4436f472bd346ebe3c0aab71d30cba13bb60d4dfe267318b) # wlroots-0.17.0.tar.gz.sig
 
-##  8df3fe778d1a8635ae370fbfd9af6601739a9d4c54f81439e5cf95acd06d9521  wlroots-0.17.0-01-x86_64.pkg.tar.lz
+##  ddba49257030bcd9a911a0cfa23f2c10895c5798dcb2baec92673defc3f27856  wlroots-0.17.0-03-x86_64.pkg.tar.lz
 

wlroots/deps

@@ -11,10 +11,8 @@ meson
 ninja
 vulkan-headers
 wayland-protocols
-libdisplay-info
 xorg-xwayland
-
-
-libliftoff
 cmake
 cairo
+
+

wlroots0.16/PKGBUILD

@@ -0,0 +1,96 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=wlroots0.16
+pkgver=0.16.2
+pkgrel=02
+pkgdesc='Modular Wayland compositor library'
+url='https://gitlab.freedesktop.org/wlroots/wlroots'
+depends=(
+    'libglvnd'
+    'libinput'
+    'libpixman-1.so'
+    'libseat.so'
+    'libudev.so'
+    'libvulkan.so'
+    'libwayland-client.so'
+    'libwayland-server.so'
+    'libxcb'
+    'libxkbcommon.so'
+    'opengl-driver'
+    'xcb-util-errors'
+    'xcb-util-renderutil'
+    'xcb-util-wm'
+)
+makedepends=(
+    'glslang'
+    'meson'
+    'ninja'
+    'vulkan-headers'
+    'wayland-protocols'
+    'xorg-xwayland'
+)
+optdepends=(
+    'xorg-xwayland: Xwayland support'
+)
+provides=(
+    'libwlroots.so'
+)
+# options=(debug)
+source=(
+    "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz"
+    "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig"
+    "Revert-layer-shell-error-on-0-dimension-without-anch.patch"
+)
+
+prepare() {
+    cd wlroots-"${pkgver}"
+    # Allow a minor protocol violation until phosh is fixed without this patch
+    # phosh crashes on launch.
+    patch -Np1 -i "${srcdir}/Revert-layer-shell-error-on-0-dimension-without-anch.patch"
+}
+
+build() {
+    arch-meson \
+      --includedir    /usr/include/wlroots0.16 \
+      --libdir        /usr/lib/wlroots0.16 \
+      wlroots-"${pkgver}" build
+    ninja -C build
+}
+
+package() {
+    DESTDIR="$pkgdir" ninja -C build install
+    install -Dm644 "wlroots-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
+
+    cd "${pkgdir}"
+    # Move libs to /usr/lib, except the .so symlinks
+    local f
+    for f in usr/lib/wlroots0.16/*; do
+      if [[ $f == *.so ]]; then
+        ln -srf -- usr/lib/"$(readlink "$f")" "$f"
+      elif [[ ! -d $f ]]; then
+        mv "$f" usr/lib
+      fi
+    done
+}
+
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
+
+license=('MIT')
+
+validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48'  # Simon Ser
+    '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A'  # Drew DeVault
+    '4100929B33EEB0FD1DB852797BC79407090047CA') # Sway signing key
+
+sha256sums=(83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa  # wlroots-0.16.2.tar.gz
+	c97e053085872acaaf13cc9b175381a7a0b0d37dd0f6bbdd5ac12e4000f0fcf3  # wlroots-0.16.2.tar.gz.sig
+	d53a62f49334fe15583a951c9e38e7f9f74b19210bdb7f80f16ec0398c3d7b3e) # Revert-layer-shell-error-on-0-dimension-without-anch.patch
+
+##  1296b4182d438e24989caeee1fe88a87070a14a7c87a2d0ef35705abaa9de241  wlroots0.16-0.16.2-02-x86_64.pkg.tar.lz
+

wlroots0.16/PKGBUILD-arch

@@ -0,0 +1,87 @@
+# Maintainer: Brett Cornwall <ainola@archlinux.org>
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Contributor: Omar Pakker
+
+pkgname=wlroots0.16
+pkgver=0.16.2
+pkgrel=2
+license=('MIT')
+pkgdesc='Modular Wayland compositor library'
+url='https://gitlab.freedesktop.org/wlroots/wlroots'
+arch=('x86_64')
+depends=(
+    'libglvnd'
+    'libinput'
+    'libpixman-1.so'
+    'libseat.so'
+    'libudev.so'
+    'libvulkan.so'
+    'libwayland-client.so'
+    'libwayland-server.so'
+    'libxcb'
+    'libxkbcommon.so'
+    'opengl-driver'
+    'xcb-util-errors'
+    'xcb-util-renderutil'
+    'xcb-util-wm'
+)
+makedepends=(
+    'glslang'
+    'meson'
+    'ninja'
+    'systemd'
+    'vulkan-headers'
+    'wayland-protocols'
+    'xorg-xwayland'
+)
+optdepends=(
+    'xorg-xwayland: Xwayland support'
+)
+provides=(
+    'libwlroots.so'
+)
+source=(
+    "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz"
+    "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig"
+    "Revert-layer-shell-error-on-0-dimension-without-anch.patch"
+)
+sha256sums=('83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa'
+            'SKIP'
+            'd53a62f49334fe15583a951c9e38e7f9f74b19210bdb7f80f16ec0398c3d7b3e')
+validpgpkeys=(
+    '34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser
+    '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A' # Drew DeVault
+    '4100929B33EEB0FD1DB852797BC79407090047CA' # Sway signing key
+)
+
+prepare() {
+    cd wlroots-"${pkgver}"
+    # Allow a minor protocol violation until phosh is fixed without this patch
+    # phosh crashes on launch.
+    patch -Np1 -i "${srcdir}/Revert-layer-shell-error-on-0-dimension-without-anch.patch"
+}
+
+build() {
+    arch-meson \
+      --includedir    /usr/include/wlroots0.16 \
+      --libdir        /usr/lib/wlroots0.16 \
+      wlroots-"${pkgver}" build
+    ninja -C build
+}
+
+package() {
+    DESTDIR="$pkgdir" ninja -C build install
+    install -Dm644 "wlroots-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
+
+    cd "${pkgdir}"
+    # Move libs to /usr/lib, except the .so symlinks
+    local f
+    for f in usr/lib/wlroots0.16/*; do
+      if [[ $f == *.so ]]; then
+        ln -srf -- usr/lib/"$(readlink "$f")" "$f"
+      elif [[ ! -d $f ]]; then
+        mv "$f" usr/lib
+      fi
+    done
+}
+##  5de575ef2699bb1740ea7bb11214412b2aa505296228b6b75df13b3db699a9e7  # PKGBUILD

wlroots0.16/Revert-layer-shell-error-on-0-dimension-without-anch.patch

@@ -0,0 +1,44 @@
+From 05a740206a73c6aab3762eb449b0733e5b9a4c7a Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Sat, 25 Jun 2022 21:22:08 -0700
+Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors"
+
+This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3.
+---
+ types/wlr_layer_shell_v1.c | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
+index fa054d3c..062fa96d 100644
+--- a/types/wlr_layer_shell_v1.c
++++ b/types/wlr_layer_shell_v1.c
+@@ -316,26 +316,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
+ 	struct wlr_layer_surface_v1 *surface =
+ 		wlr_layer_surface_v1_from_wlr_surface(wlr_surface);
+ 
+-	const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
+-		ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+-	if (surface->pending.desired_width == 0 &&
+-		(surface->pending.anchor & horiz) != horiz) {
+-		wl_resource_post_error(surface->resource,
+-			ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
+-			"width 0 requested without setting left and right anchors");
+-		return;
+-	}
+-
+-	const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
+-		ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+-	if (surface->pending.desired_height == 0 &&
+-		(surface->pending.anchor & vert) != vert) {
+-		wl_resource_post_error(surface->resource,
+-			ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
+-			"height 0 requested without setting top and bottom anchors");
+-		return;
+-	}
+-
+ 	surface->current = surface->pending;
+ 	surface->pending.committed = 0;
+ 
+-- 
+2.37.3
+

wlroots0.16/clean

@@ -0,0 +1 @@
+rm -rf {src,pkg,wlroots*tar.gz*}

wlroots0.16/deps

@@ -0,0 +1,20 @@
+libglvnd
+libinput
+seatd
+libxcb
+libxkbcommon
+mesa
+xcb-util-errors
+xcb-util-renderutil
+xcb-util-wm
+glslang
+meson
+ninja
+vulkan-headers
+vulkan-icd-loader
+pixman
+wayland-protocols
+xorg-xwayland
+cmake
+
+

wlroots0.16/key

@@ -0,0 +1 @@
+gpg --recv-key 0FDE7BE0E88F5E48

wlroots0.16/time

@@ -0,0 +1,6 @@
+
+
+real	0m18.749s
+user	0m52.834s
+sys	0m6.312s
+