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

[Jonas Witschel]

    Date: Monday, December 13, 2021 @ 22:23:28
  Author: diabonas
Revision: 1072559

weechat-matrix: use URL of upstreamed instead of local patch

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

------------------------------------------------------+
 PKGBUILD                                             |    9 ++---
 weechat-matrix_py3.10-remove-set_npn_protocols.patch |   30 -----------------
 2 files changed, 5 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-13 22:13:36 UTC (rev 1072558)
+++ PKGBUILD	2021-12-13 22:23:28 UTC (rev 1072559)
@@ -17,9 +17,9 @@
             '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')
+        "weechat-matrix-0.3.0_remove-set_npn_protocols.patch::$url/commit/4e585d5f4628e6fbeba9ec4560b440d731e076f5.patch")
 sha512sums=('SKIP'
-            '5dd6cee976de77a6747e238b3600bb0e83322482daedc7943d712ecc8e903cb452f46133a4fbb4f43e562dc7c2acffc5e8eece7e87ae21ca4affc5089444cc95')
+            'a374aae0e3df0c47476ea100bd7bb570a46530a6daa5318a445e1c0becff64cdb0a62368e18c076bdb7a06a05e7ba8f02f806f0aa0062b4dacc98af3a26d978f')
 validpgpkeys=('689A3B5BC6560AB4C99A2A0581314DA807EF4E22') # Damir Jelić (poljar) <poljar at termina.org.uk>
 
 pkgver() {
@@ -32,8 +32,9 @@
 	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"
+	# 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() {

Deleted: weechat-matrix_py3.10-remove-set_npn_protocols.patch
===================================================================
--- weechat-matrix_py3.10-remove-set_npn_protocols.patch	2021-12-13 22:13:36 UTC (rev 1072558)
+++ weechat-matrix_py3.10-remove-set_npn_protocols.patch	2021-12-13 22:23:28 UTC (rev 1072559)
@@ -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
-