[arch-commits] Commit in weechat-matrix/repos/community-any (5 files)
Jonas Witschel
diabonas at gemini.archlinux.org
Sun Feb 20 09:45:11 UTC 2022
Date: Sunday, February 20, 2022 @ 09:45:10
Author: diabonas
Revision: 1135240
archrelease: copy trunk to community-any
Added:
weechat-matrix/repos/community-any/PKGBUILD
(from rev 1135239, weechat-matrix/trunk/PKGBUILD)
weechat-matrix/repos/community-any/weechat-matrix.install
(from rev 1135239, weechat-matrix/trunk/weechat-matrix.install)
Deleted:
weechat-matrix/repos/community-any/PKGBUILD
weechat-matrix/repos/community-any/weechat-matrix.install
weechat-matrix/repos/community-any/weechat-matrix_py3.10-remove-set_npn_protocols.patch
------------------------------------------------------+
PKGBUILD | 116 ++++++++---------
weechat-matrix.install | 28 ++--
weechat-matrix_py3.10-remove-set_npn_protocols.patch | 30 ----
3 files changed, 72 insertions(+), 102 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-20 09:44:52 UTC (rev 1135239)
+++ PKGBUILD 2022-02-20 09:45:10 UTC (rev 1135240)
@@ -1,58 +0,0 @@
-# Maintainer: Jonas Witschel <diabonas at archlinux.org>
-pkgname=weechat-matrix
-pkgver=0.3.0
-_tag=ebf792a233a50d639b13e5f7c9a1c1fe988e7476 # git rev-parse "$pkgver"
-pkgrel=5
-pkgdesc='WeeChat Matrix protocol script written in Python'
-arch=('any')
-url='https://github.com/poljar/weechat-matrix'
-license=('ISC')
-depends=('python' 'python-atomicwrites' 'python-attrs' 'python-logbook' 'python-matrix-nio'
- 'python-pygments' 'python-pyopenssl' 'python-webcolors' 'weechat')
-makedepends=('git' 'python-dephell' 'python-setuptools')
-checkdepends=('python-hypothesis' 'python-pytest')
-optdepends=('python-aiohttp: matrix_sso_helper support'
- 'python-magic: matrix_upload support'
- '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"
- 'weechat-matrix_py3.10-remove-set_npn_protocols.patch')
-sha512sums=('SKIP'
- '5dd6cee976de77a6747e238b3600bb0e83322482daedc7943d712ecc8e903cb452f46133a4fbb4f43e562dc7c2acffc5e8eece7e87ae21ca4affc5089444cc95')
-validpgpkeys=('689A3B5BC6560AB4C99A2A0581314DA807EF4E22') # Damir Jelić (poljar) <poljar at termina.org.uk>
-
-pkgver() {
- cd "$pkgname"
- git describe | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
-}
-
-prepare() {
- cd "$pkgname"
- sed -ri 's|#!/usr/bin/env( -S)? python3|#!/usr/bin/python3|' contrib/*.py
- dephell deps convert --from pyproject.toml --to setup.py
-
- # Remove deprecated function which is broken in Python 3.10
- patch --forward --strip=1 --input="$srcdir/weechat-matrix_py3.10-remove-set_npn_protocols.patch"
-}
-
-build() {
- cd "$pkgname"
- python setup.py build
-}
-
-check() {
- cd "$pkgname"
- python -m pytest
-}
-
-package() {
- cd "$pkgname"
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- install -Dm755 main.py "$pkgdir/usr/share/weechat/python/weechat-matrix.py"
- for _script in matrix_decrypt matrix_sso_helper matrix_upload
- do
- install -Dm755 "contrib/$_script.py" "$pkgdir/usr/bin/$_script"
- done
- install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
-}
Copied: weechat-matrix/repos/community-any/PKGBUILD (from rev 1135239, weechat-matrix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-20 09:45:10 UTC (rev 1135240)
@@ -0,0 +1,58 @@
+# Maintainer: Jonas Witschel <diabonas at archlinux.org>
+pkgname=weechat-matrix
+pkgver=0.3.0
+_tag=ebf792a233a50d639b13e5f7c9a1c1fe988e7476 # git rev-parse "$pkgver"
+pkgrel=6
+pkgdesc='WeeChat Matrix protocol script written in Python'
+arch=('any')
+url='https://github.com/poljar/weechat-matrix'
+license=('ISC')
+depends=('python' 'python-atomicwrites' 'python-attrs' 'python-logbook' 'python-matrix-nio'
+ 'python-pygments' 'python-pyopenssl' 'python-webcolors' 'weechat')
+makedepends=('git' 'python-build' 'python-installer' 'python-poetry')
+checkdepends=('python-hypothesis' 'python-pytest')
+optdepends=('python-aiohttp: matrix_sso_helper support'
+ 'python-magic: matrix_upload support'
+ '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"
+ "weechat-matrix-0.3.0_remove-set_npn_protocols.patch::$url/commit/4e585d5f4628e6fbeba9ec4560b440d731e076f5.patch")
+sha512sums=('SKIP'
+ 'a374aae0e3df0c47476ea100bd7bb570a46530a6daa5318a445e1c0becff64cdb0a62368e18c076bdb7a06a05e7ba8f02f806f0aa0062b4dacc98af3a26d978f')
+validpgpkeys=('689A3B5BC6560AB4C99A2A0581314DA807EF4E22') # Damir Jelić (poljar) <poljar at termina.org.uk>
+
+pkgver() {
+ cd "$pkgname"
+ git describe | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
+}
+
+prepare() {
+ cd "$pkgname"
+ sed -ri 's|#!/usr/bin/env( -S)? python3|#!/usr/bin/python3|' contrib/*.py
+
+ # SSLContext.set_npn_protocols broken in Python 3.10
+ # (https://github.com/poljar/weechat-matrix/issues/308)
+ patch --forward --strip=1 --input="$srcdir/weechat-matrix-0.3.0_remove-set_npn_protocols.patch"
+}
+
+build() {
+ cd "$pkgname"
+ python -m build --wheel --no-isolation --skip-dependency-check
+}
+
+check() {
+ cd "$pkgname"
+ python -m pytest
+}
+
+package() {
+ cd "$pkgname"
+ python -m installer --destdir="$pkgdir" dist/*.whl
+ install -Dm755 main.py "$pkgdir/usr/share/weechat/python/weechat-matrix.py"
+ for _script in matrix_decrypt matrix_sso_helper matrix_upload
+ do
+ install -Dm755 "contrib/$_script.py" "$pkgdir/usr/bin/$_script"
+ done
+ install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: weechat-matrix.install
===================================================================
--- weechat-matrix.install 2022-02-20 09:44:52 UTC (rev 1135239)
+++ weechat-matrix.install 2022-02-20 09:45:10 UTC (rev 1135240)
@@ -1,14 +0,0 @@
-post_install() {
- echo "To load this script, execute the following command in WeeChat:"
- echo "/script load weechat-matrix.py"
- echo "To load it automatically during WeeChat startup, use:"
- echo "mkdir -p ~/.local/share/weechat/python/autoload"
- echo "ln -s /usr/share/weechat/python/weechat-matrix.py -t ~/.local/share/weechat/python/autoload"
-}
-
-post_upgrade() {
- if [ "$(vercmp "$2" 0.2.0-2)" -lt 0 ]
- then
- post_install
- fi
-}
Copied: weechat-matrix/repos/community-any/weechat-matrix.install (from rev 1135239, weechat-matrix/trunk/weechat-matrix.install)
===================================================================
--- weechat-matrix.install (rev 0)
+++ weechat-matrix.install 2022-02-20 09:45:10 UTC (rev 1135240)
@@ -0,0 +1,14 @@
+post_install() {
+ echo "To load this script, execute the following command in WeeChat:"
+ echo "/script load weechat-matrix.py"
+ echo "To load it automatically during WeeChat startup, use:"
+ echo "mkdir -p ~/.local/share/weechat/python/autoload"
+ echo "ln -s /usr/share/weechat/python/weechat-matrix.py -t ~/.local/share/weechat/python/autoload"
+}
+
+post_upgrade() {
+ if [ "$(vercmp "$2" 0.2.0-2)" -lt 0 ]
+ then
+ post_install
+ fi
+}
Deleted: weechat-matrix_py3.10-remove-set_npn_protocols.patch
===================================================================
--- weechat-matrix_py3.10-remove-set_npn_protocols.patch 2022-02-20 09:44:52 UTC (rev 1135239)
+++ weechat-matrix_py3.10-remove-set_npn_protocols.patch 2022-02-20 09:45:10 UTC (rev 1135240)
@@ -1,30 +0,0 @@
-From 4e585d5f4628e6fbeba9ec4560b440d731e076f5 Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <diabonas at archlinux.org>
-Date: Sat, 11 Dec 2021 19:47:16 +0100
-Subject: [PATCH] server: remove set_npn_protocols()
-
-This function is deprecated in favour of set_alpn_protocols(), which is already
-called, and is currently broken in Python 3.10, so remove it altogether.
----
- matrix/server.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/matrix/server.py b/matrix/server.py
-index dda861e..0f34c1e 100644
---- a/matrix/server.py
-+++ b/matrix/server.py
-@@ -303,11 +303,6 @@ class MatrixServer(object):
- # Enable http2 negotiation on the ssl context.
- self.ssl_context.set_alpn_protocols(["h2", "http/1.1"])
-
-- try:
-- self.ssl_context.set_npn_protocols(["h2", "http/1.1"])
-- except NotImplementedError:
-- pass
--
- self.address = None
- self.homeserver = None
- self.client = None # type: Optional[HttpClient]
---
-2.34.1
-
More information about the arch-commits
mailing list