[PR PATCH] synapse: update to 1.69.0.

[PR PATCH] synapse: update to 1.69.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1157 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/40009

synapse: update to 1.69.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40009.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-40009.patch --]
[-- Type: text/x-diff, Size: 7659 bytes --]

From 18c93e3ae66d515ea2b5ff28a28b3361baeb5827 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 17 Oct 2022 10:17:34 -0400
Subject: [PATCH 1/3] python3-phonenumbers: update to 8.12.57.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 23de86a72eb4..dd6ddf92f928 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.56
+version=8.12.57
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=82a4f226c930d02dcdf6d4b29e4cfd8678991fe65c2efd5fdd143557186f0868
+checksum=057d1966962fb86b3dc447bfac2c8e25ceed774509e49b180926a13a99910318

From d40345f747212d1fa98094fe785edb909851477c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 17 Oct 2022 10:18:49 -0400
Subject: [PATCH 2/3] python3-prometheus_client: update to 0.15.0.

---
 srcpkgs/python3-prometheus_client/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prometheus_client/template b/srcpkgs/python3-prometheus_client/template
index 901d6f9c1748..fb705c818643 100644
--- a/srcpkgs/python3-prometheus_client/template
+++ b/srcpkgs/python3-prometheus_client/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prometheus_client'
 pkgname=python3-prometheus_client
-version=0.14.1
+version=0.15.0
 revision=1
 wrksrc="prometheus_client-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/prometheus/client_python"
 distfiles="${PYPI_SITE}/p/prometheus_client/prometheus_client-${version}.tar.gz"
-checksum=5459c427624961076277fdc6dc50540e2bacb98eebde99886e59ec55ed92093a
+checksum=be26aa452490cfcf6da953f9436e95a9f2b4d578ca80094b4458930e5f584ab1

From 7f776abad1b78dafc40931017bd5dc3f9cd274b3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 17 Oct 2022 09:37:11 -0400
Subject: [PATCH 3/3] synapse: update to 1.69.0.

---
 srcpkgs/synapse/patches/dependency-fix.patch | 23 -------
 srcpkgs/synapse/patches/poetry-fix.patch     | 72 --------------------
 srcpkgs/synapse/template                     |  6 +-
 3 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/synapse/patches/dependency-fix.patch
 delete mode 100644 srcpkgs/synapse/patches/poetry-fix.patch

diff --git a/srcpkgs/synapse/patches/dependency-fix.patch b/srcpkgs/synapse/patches/dependency-fix.patch
deleted file mode 100644
index 3a51bd323cd2..000000000000
--- a/srcpkgs/synapse/patches/dependency-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-The only purpose of the setuptools_rust runtime dependency is to work around
-poetry mishandling build-time dependencies. Eliminate it to avoid spurious
-errors when launching synapse.
-
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -174,16 +174,6 @@
- # This is the most recent version of Pydantic with available on common distros.
- pydantic = ">=1.7.4"
- 
--# This is for building the rust components during "poetry install", which
--# currently ignores the `build-system.requires` directive (c.f.
--# https://github.com/python-poetry/poetry/issues/6154). Both `pip install` and
--# `poetry build` do the right thing without this explicit dependency.
--#
--# This isn't really a dev-dependency, as `poetry install --no-dev` will fail,
--# but the alternative is to add it to the main list of deps where it isn't
--# needed.
--setuptools_rust = ">=1.3"
--
- 
- # Optional Dependencies
- # ---------------------
diff --git a/srcpkgs/synapse/patches/poetry-fix.patch b/srcpkgs/synapse/patches/poetry-fix.patch
deleted file mode 100644
index 3c723d74981d..000000000000
--- a/srcpkgs/synapse/patches/poetry-fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From f1673866ed8a39d49e2caaa6f4255a3f696bc3b4 Mon Sep 17 00:00:00 2001
-From: David Robertson <davidr@element.io>
-Date: Fri, 7 Oct 2022 15:15:10 +0100
-Subject: [PATCH] Unpin build-system requirements, but impose an upper-bound
- (#14085)
-
-* Revert to prior build-system requirements
-
-This reverts #14080.
-
-* Use normalised extra name, which poetry-core 1.3 will generate anyway
-
-* Changelog
-
-* Upper bound build-system requirements
-
-* Remove upgrade note; expand changelog entry a little.
-
-* Fix typo in build-system comment
-
-Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
-
-Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
----
- changelog.d/14085.misc       |  1 +
- pyproject.toml               | 11 ++++++++---
- synapse/config/repository.py |  2 +-
- 3 files changed, 10 insertions(+), 4 deletions(-)
- create mode 100644 changelog.d/14085.misc
-
-diff --git a/changelog.d/14085.misc b/changelog.d/14085.misc
-new file mode 100644
-index 00000000000..2d2df70a64e
---- /dev/null
-+++ b/changelog.d/14085.misc
-@@ -0,0 +1 @@
-+Rename the `url_preview` extra to `url-preview`, for compatability with poetry-core 1.3.0 and [PEP 685](https://peps.python.org/pep-0685/). From-source installations using this extra will need to install using the new name.
-diff --git a/pyproject.toml b/pyproject.toml
-index 622d6a9e892..81b2659eb1f 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -219,7 +219,7 @@ oidc = ["authlib"]
- # `systemd.journal.JournalHandler`, as is documented in
- # `contrib/systemd/log_config.yaml`.
- systemd = ["systemd-python"]
--url_preview = ["lxml"]
-+url-preview = ["lxml"]
- sentry = ["sentry-sdk"]
- opentracing = ["jaeger-client", "opentracing"]
- jwt = ["authlib"]
-@@ -250,7 +250,7 @@ all = [
-     "pysaml2",
-     # oidc and jwt
-     "authlib",
--    # url_preview
-+    # url-preview
-     "lxml",
-     # sentry
-     "sentry-sdk",
-diff --git a/synapse/config/repository.py b/synapse/config/repository.py
-index 1033496bb43..e4759711ed9 100644
---- a/synapse/config/repository.py
-+++ b/synapse/config/repository.py
-@@ -205,7 +205,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
-         )
-         self.url_preview_enabled = config.get("url_preview_enabled", False)
-         if self.url_preview_enabled:
--            check_requirements("url_preview")
-+            check_requirements("url-preview")
- 
-             proxy_env = getproxies_environment()
-             if "url_preview_ip_range_blacklist" not in config:
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 85c3e1a68f03..b4f2d4f7d604 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.68.0
-revision=2
+version=1.69.0
+revision=1
 build_style=python3-pep517
 build_helper=rust
 make_check_target=tests
@@ -23,7 +23,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=3da9f788530905abc1c5db02f0cb2afd01b65463fe6962f1c4394ac153aad8ac
+checksum=6954fdee1b5ec27083ecafdbb8719133c147885348ceb7f7a081d4f97cee0026
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

Re: [PR PATCH] [Merged]: synapse: update to 1.69.0.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 982 bytes --]

There's a merged pull request on the void-packages repository

synapse: update to 1.69.0.
https://github.com/void-linux/void-packages/pull/40009

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->