Date: Monday, January 9, 2023 @ 18:56:01 Author: dvzrv Revision: 1382153
upgpkg: weechat-matrix 0.3.0-9: Rebuild to fix build requirements. Switch to python-poetry-core in makedepends by applying upstreamed patch: https://github.com/poljar/weechat-matrix/pull/340 Added: weechat-matrix/trunk/0001-Switch-to-correct-build-system-definition.patch Modified: weechat-matrix/trunk/PKGBUILD ------------------------------------------------------+ 0001-Switch-to-correct-build-system-definition.patch | 27 +++++++++++++++++ PKGBUILD | 15 ++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) Added: 0001-Switch-to-correct-build-system-definition.patch =================================================================== --- 0001-Switch-to-correct-build-system-definition.patch (rev 0) +++ 0001-Switch-to-correct-build-system-definition.patch 2023-01-09 18:56:01 UTC (rev 1382153) @@ -0,0 +1,27 @@ +From b05b004192f9922c90a4399bee5c1cacc5a48b67 Mon Sep 17 00:00:00 2001 +From: David Runge <[email protected]> +Date: Mon, 9 Jan 2023 19:50:39 +0100 +Subject: [PATCH] Switch to correct build-system definition + +pyproject.toml: +Use the correct PEP517 build-backend, as defined by poetry upstream +(https://python-poetry.org/docs/pyproject#poetry-and-pep-517). +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 709adf1..d3292af 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -31,5 +31,5 @@ matrix_sso_helper = ["aiohttp"] + matrix_upload = ["python-magic", "requests"] + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" +-- +2.39.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-01-09 18:55:32 UTC (rev 1382152) +++ PKGBUILD 2023-01-09 18:56:01 UTC (rev 1382153) @@ -2,7 +2,7 @@ pkgname=weechat-matrix pkgver=0.3.0 _tag=ebf792a233a50d639b13e5f7c9a1c1fe988e7476 # git rev-parse "$pkgver" -pkgrel=8 +pkgrel=9 pkgdesc='WeeChat Matrix protocol script written in Python' arch=('any') url='https://github.com/poljar/weechat-matrix' @@ -9,7 +9,7 @@ license=('ISC') depends=('python' 'python-atomicwrites' 'python-attrs' 'python-cachetools' 'python-logbook' 'python-matrix-nio' 'python-olm' 'python-peewee' 'python-pygments' 'python-pyopenssl' 'python-webcolors' 'weechat') -makedepends=('git' 'python-build' 'python-installer' 'python-poetry') +makedepends=('git' 'python-build' 'python-installer' 'python-poetry-core') checkdepends=('python-hypothesis' 'python-pytest') optdepends=('python-aiohttp: matrix_sso_helper support' 'python-magic: matrix_upload support' @@ -16,8 +16,12 @@ 'python-requests: matrix_decrypt and matrix_upload support' 'xdg-utils: default plumber for matrix_decrypt') install='weechat-matrix.install' -source=("git+$url.git?signed#tag=$_tag") -sha512sums=('SKIP') +source=( + "git+$url.git?signed#tag=$_tag" + 0001-Switch-to-correct-build-system-definition.patch +) +sha512sums=('SKIP' + '65be133214b4497fead85e718d3dc57502063f4411c759d878e7132b2cb49befe5515714edda188169710c246537d893611aa8ef6faeaeab23762302e6e783b6') validpgpkeys=('689A3B5BC6560AB4C99A2A0581314DA807EF4E22') # Damir Jelić (poljar) <[email protected]> pkgver() { @@ -26,6 +30,9 @@ } prepare() { + # fix PEP517 build-system definition: https://github.com/poljar/weechat-matrix/pull/340/files + patch -Np1 -d $pkgname -i ../0001-Switch-to-correct-build-system-definition.patch + cd "$pkgname" sed -ri 's|#!/usr/bin/env( -S)? python3|#!/usr/bin/python3|' contrib/*.py
