Attachment 243424 Details for Bug 272104 – net-im/py-matrix-synapse: Update to 1.87.0, fix build issues

[patch] net-im/py-matrix-synapse: Update to 1.87.0, fix build issues

py-matrix-synapse-1.87.0-fixed.patch (text/plain), 8.16 KB, created by Sascha Biberhofer on 2023-07-16 17:21:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Biberhofer

Created: 2023-07-16 17:21:33 UTC

Size: 8.16 KB

patch

obsolete

>diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
>index 668212ad15ec..c302e8982c3e 100644
>--- a/net-im/py-matrix-synapse/Makefile
>+++ b/net-im/py-matrix-synapse/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	matrix-synapse
>-DISTVERSION=	1.85.2
>+DISTVERSION=	1.87.0
> CATEGORIES=	net-im python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +12,7 @@ WWW=		https://www.matrix.org
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.6.0:devel/py-poetry-core@${PY_FLAVOR} \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.6.1:devel/py-poetry-core@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3:devel/py-setuptools-rust@${PY_FLAVOR}
> 
> # Keep the RUN_DEPENDS layout similar to the pyproject.toml file
>diff --git a/net-im/py-matrix-synapse/Makefile.crates b/net-im/py-matrix-synapse/Makefile.crates
>index 9c02d080262a..8f15f8fa7ac8 100644
>--- a/net-im/py-matrix-synapse/Makefile.crates
>+++ b/net-im/py-matrix-synapse/Makefile.crates
>@@ -1,4 +1,4 @@
>-CARGO_CRATES=	aho-corasick-0.7.19 \
>+CARGO_CRATES=	aho-corasick-1.0.2 \
> 		anyhow-1.0.71 \
> 		arc-swap-1.5.1 \
> 		autocfg-1.1.0 \
>@@ -15,7 +15,7 @@ CARGO_CRATES=	aho-corasick-0.7.19 \
> 		lazy_static-1.4.0 \
> 		libc-0.2.135 \
> 		lock_api-0.4.9 \
>-		log-0.4.18 \
>+		log-0.4.19 \
> 		memchr-2.5.0 \
> 		memoffset-0.6.5 \
> 		once_cell-1.15.0 \
>@@ -25,19 +25,19 @@ CARGO_CRATES=	aho-corasick-0.7.19 \
> 		pyo3-0.17.3 \
> 		pyo3-build-config-0.17.3 \
> 		pyo3-ffi-0.17.3 \
>-		pyo3-log-0.8.1 \
>+		pyo3-log-0.8.2 \
> 		pyo3-macros-0.17.3 \
> 		pyo3-macros-backend-0.17.3 \
> 		pythonize-0.17.0 \
> 		quote-1.0.26 \
> 		redox_syscall-0.2.16 \
>-		regex-1.7.3 \
>-		regex-syntax-0.6.29 \
>+		regex-1.8.4 \
>+		regex-syntax-0.7.2 \
> 		ryu-1.0.11 \
> 		scopeguard-1.1.0 \
>-		serde-1.0.163 \
>-		serde_derive-1.0.163 \
>-		serde_json-1.0.96 \
>+		serde-1.0.164 \
>+		serde_derive-1.0.164 \
>+		serde_json-1.0.99 \
> 		smallvec-1.10.0 \
> 		subtle-2.4.1 \
> 		syn-1.0.104 \
>diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
>index d6740dee3a28..4725b297ca24 100644
>--- a/net-im/py-matrix-synapse/distinfo
>+++ b/net-im/py-matrix-synapse/distinfo
>@@ -1,8 +1,8 @@
>-TIMESTAMP = 1686279217
>-SHA256 (matrix_synapse-1.85.2.tar.gz) = 3441f27dae8864d0b2db2dcc8c2c6284f7487cb228e88968a753fc776e3e0628
>-SIZE (matrix_synapse-1.85.2.tar.gz) = 3199739
>-SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e
>-SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070
>+TIMESTAMP = 1688493981
>+SHA256 (matrix_synapse-1.87.0.tar.gz) = 6bdd836512f0c96158af8eef9870e75c6420e465c3becc4f2c504b76261f83e5
>+SIZE (matrix_synapse-1.87.0.tar.gz) = 3216171
>+SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41
>+SIZE (rust/crates/aho-corasick-1.0.2.crate) = 167694
> SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8
> SIZE (rust/crates/anyhow-1.0.71.crate) = 43808
> SHA256 (rust/crates/arc-swap-1.5.1.crate) = 983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164
>@@ -35,8 +35,8 @@ SHA256 (rust/crates/libc-0.2.135.crate) = 68783febc7782c6c5cb401fbda4de5a9898be1
> SIZE (rust/crates/libc-0.2.135.crate) = 604591
> SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df
> SIZE (rust/crates/lock_api-0.4.9.crate) = 25685
>-SHA256 (rust/crates/log-0.4.18.crate) = 518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de
>-SIZE (rust/crates/log-0.4.18.crate) = 38339
>+SHA256 (rust/crates/log-0.4.19.crate) = b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4
>+SIZE (rust/crates/log-0.4.19.crate) = 38073
> SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
> SIZE (rust/crates/memchr-2.5.0.crate) = 65812
> SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
>@@ -55,8 +55,8 @@ SHA256 (rust/crates/pyo3-build-config-0.17.3.crate) = 28fcd1e73f06ec85bf3280c48c
> SIZE (rust/crates/pyo3-build-config-0.17.3.crate) = 29230
> SHA256 (rust/crates/pyo3-ffi-0.17.3.crate) = 0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc
> SIZE (rust/crates/pyo3-ffi-0.17.3.crate) = 62854
>-SHA256 (rust/crates/pyo3-log-0.8.1.crate) = f9c8b57fe71fb5dcf38970ebedc2b1531cf1c14b1b9b4c560a182a57e115575c
>-SIZE (rust/crates/pyo3-log-0.8.1.crate) = 14082
>+SHA256 (rust/crates/pyo3-log-0.8.2.crate) = c94ff6535a6bae58d7d0b85e60d4c53f7f84d0d0aa35d6a28c3f3e70bfe51444
>+SIZE (rust/crates/pyo3-log-0.8.2.crate) = 14254
> SHA256 (rust/crates/pyo3-macros-0.17.3.crate) = 94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28
> SIZE (rust/crates/pyo3-macros-0.17.3.crate) = 7257
> SHA256 (rust/crates/pyo3-macros-backend-0.17.3.crate) = c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f
>@@ -67,20 +67,20 @@ SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554
> SIZE (rust/crates/quote-1.0.26.crate) = 28397
> SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
> SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
>-SHA256 (rust/crates/regex-1.7.3.crate) = 8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d
>-SIZE (rust/crates/regex-1.7.3.crate) = 239886
>-SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
>-SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
>+SHA256 (rust/crates/regex-1.8.4.crate) = d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f
>+SIZE (rust/crates/regex-1.8.4.crate) = 249562
>+SHA256 (rust/crates/regex-syntax-0.7.2.crate) = 436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78
>+SIZE (rust/crates/regex-syntax-0.7.2.crate) = 339778
> SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09
> SIZE (rust/crates/ryu-1.0.11.crate) = 47007
> SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
> SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
>-SHA256 (rust/crates/serde-1.0.163.crate) = 2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2
>-SIZE (rust/crates/serde-1.0.163.crate) = 77030
>-SHA256 (rust/crates/serde_derive-1.0.163.crate) = 8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e
>-SIZE (rust/crates/serde_derive-1.0.163.crate) = 54447
>-SHA256 (rust/crates/serde_json-1.0.96.crate) = 057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1
>-SIZE (rust/crates/serde_json-1.0.96.crate) = 144652
>+SHA256 (rust/crates/serde-1.0.164.crate) = 9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d
>+SIZE (rust/crates/serde-1.0.164.crate) = 77057
>+SHA256 (rust/crates/serde_derive-1.0.164.crate) = d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68
>+SIZE (rust/crates/serde_derive-1.0.164.crate) = 54789
>+SHA256 (rust/crates/serde_json-1.0.99.crate) = 46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3
>+SIZE (rust/crates/serde_json-1.0.99.crate) = 145102
> SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
> SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
> SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601
>diff --git a/net-im/py-matrix-synapse/files/patch-synapse_media_thumbnailer.py b/net-im/py-matrix-synapse/files/patch-synapse_media_thumbnailer.py
>new file mode 100644
>index 000000000000..64fb9363aad5
>--- /dev/null
>+++ b/net-im/py-matrix-synapse/files/patch-synapse_media_thumbnailer.py
>@@ -0,0 +1,11 @@
>+--- synapse/media/thumbnailer.py.orig  2023-07-11 08:10:15 UTC
>++++ synapse/media/thumbnailer.py
>+@@ -131,7 +131,7 @@ class Thumbnailer:
>+             else:
>+                 with self.image:
>+                     self.image = self.image.convert("RGB")
>+-        return self.image.resize((width, height), Image.ANTIALIAS)
>++        return self.image.resize((width, height), Image.LANCZOS)
>+ 
>+     def scale(self, width: int, height: int, output_type: str) -> BytesIO:
>+         """Rescales the image to the given dimensions.

Actions: View | Diff

Attachments on bug 272104: 242897 | 243204 | 243424