[arch-commits] Commit in weechat-matrix/trunk (2 files)

[Jonas Witschel]

    Date: Saturday, December 11, 2021 @ 19:25:50
  Author: diabonas
Revision: 1068311

upgpkg: weechat-matrix 0.3.0-5: work around a Python 3.10 bug (FS#72979)

Added:
  weechat-matrix/trunk/weechat-matrix_py3.10-remove-set_npn_protocols.patch
Modified:
  weechat-matrix/trunk/PKGBUILD

------------------------------------------------------+
 PKGBUILD                                             |   11 ++++--
 weechat-matrix_py3.10-remove-set_npn_protocols.patch |   30 +++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-11 19:20:47 UTC (rev 1068310)
+++ PKGBUILD	2021-12-11 19:25:50 UTC (rev 1068311)
@@ -2,7 +2,7 @@
 pkgname=weechat-matrix
 pkgver=0.3.0
 _tag=ebf792a233a50d639b13e5f7c9a1c1fe988e7476 # git rev-parse "$pkgver"
-pkgrel=4
+pkgrel=5
 pkgdesc='WeeChat Matrix protocol script written in Python'
 arch=('any')
 url='https://github.com/poljar/weechat-matrix'
@@ -16,8 +16,10 @@
             '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"
+        'weechat-matrix_py3.10-remove-set_npn_protocols.patch')
+sha512sums=('SKIP'
+            '5dd6cee976de77a6747e238b3600bb0e83322482daedc7943d712ecc8e903cb452f46133a4fbb4f43e562dc7c2acffc5e8eece7e87ae21ca4affc5089444cc95')
 validpgpkeys=('689A3B5BC6560AB4C99A2A0581314DA807EF4E22') # Damir Jelić (poljar) <poljar at termina.org.uk>
 
 pkgver() {
@@ -29,6 +31,9 @@
 	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() {

Added: weechat-matrix_py3.10-remove-set_npn_protocols.patch
===================================================================
--- weechat-matrix_py3.10-remove-set_npn_protocols.patch	                        (rev 0)
+++ weechat-matrix_py3.10-remove-set_npn_protocols.patch	2021-12-11 19:25:50 UTC (rev 1068311)
@@ -0,0 +1,30 @@
+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
+