public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Gwyn Ciesla <gwync@protonmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/matrix-synapse] f45: Merge branch 'rawhide' into f45
Date: Wed, 16 Sep 2026 21:36:54 GMT	[thread overview]
Message-ID: <178959461460.1.3609865048915880233.rpms-matrix-synapse-a345a0cad158@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/matrix-synapse
Branch : f45
Commit : a345a0cad158a3944e363f26f738121a65f97dad
Author : Gwyn Ciesla <gwync@protonmail.com>
Date   : 2026-09-16T16:35:41-05:00
Stats  : +108/-2 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/matrix-synapse/c/a345a0cad158a3944e363f26f738121a65f97dad?branch=f45

Log:
Merge branch 'rawhide' into f45

---
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index c878f6c..acef954 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -4,7 +4,7 @@
 %bcond saml2 0
 
 Name:       matrix-synapse
-Version:    1.160.0
+Version:    1.161.0
 Release:    %autorelease
 Summary:    A Matrix reference homeserver written in Python using Twisted
 License:    AGPL-3.0-or-later

diff --git a/sources b/sources
index dfd3b41..5ccf89d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (synapse-1.160.0.tar.gz) = 33ae8e0cfad53ba57223b6e54c48d3f1e770dd282db8a6a867a63575ca07eb3503001c6676d431310d5db13f0b0fc05ebdf7f0c58ae6cc1aba8bd18860294f10
+SHA512 (synapse-1.161.0.tar.gz) = 9bd689a7d081fc0523693391b06769060158831974370afa1e773b4ecae0ec8c1e07338a94bba742d372bbb70875f76ae0c8e28c2ff493e5c4afcb237ffd7055

diff --git a/0001-pyo3-Disable-abi3-feature.patch b/0001-pyo3-Disable-abi3-feature.patch
new file mode 100644
index 0000000..c2da764
--- /dev/null
+++ b/0001-pyo3-Disable-abi3-feature.patch
@@ -0,0 +1,73 @@
+From bbe5c1e519aa300ba6316307a94478dd82908464 Mon Sep 17 00:00:00 2001
+From: "Kai A. Hiller" <V02460@gmail.com>
+Date: Fri, 8 Sep 2023 14:10:56 +0200
+Subject: [PATCH 1/2] pyo3: Disable abi3 feature
+
+Fedora does not require compatibility with Python versions different to
+the one at compile time.
+---
+ build_rust.py   | 22 ++--------------------
+ rust/Cargo.toml |  2 --
+ 2 files changed, 2 insertions(+), 22 deletions(-)
+
+diff --git a/build_rust.py b/build_rust.py
+index a9e9265daf..65d9ac301d 100644
+--- a/build_rust.py
++++ b/build_rust.py
+@@ -1,10 +1,8 @@
+ # A build script for poetry that adds the rust extension.
+ 
+-import itertools
+ import os
+ from typing import Any
+ 
+-from packaging.specifiers import SpecifierSet
+ from setuptools_rust import Binding, RustExtension
+ 
+ 
+@@ -16,27 +14,11 @@ def build(setup_kwargs: dict[str, Any]) -> None:
+         target="synapse.synapse_rust",
+         path=cargo_toml_path,
+         binding=Binding.PyO3,
+-        # This flag is a no-op in the latest versions. Instead, we need to
+-        # specify this in the `bdist_wheel` config below.
+-        py_limited_api=True,
++        # This flag is a no-op in the latest versions.
++        py_limited_api=False,
+         # We always build in release mode, as we can't distinguish
+         # between using `poetry` in development vs production.
+         debug=False,
+     )
+     setup_kwargs.setdefault("rust_extensions", []).append(extension)
+     setup_kwargs["zip_safe"] = False
+-
+-    # We look up the minimum supported Python version with
+-    # `python_requires` (e.g. ">=3.10.0,<4.0.0") and finding the first Python
+-    # version that matches. We then convert that into the `py_limited_api` form,
+-    # e.g. cp310 for Python 3.10.
+-    py_limited_api: str
+-    python_bounds = SpecifierSet(setup_kwargs["python_requires"])
+-    for minor_version in itertools.count(start=10):
+-        if f"3.{minor_version}.0" in python_bounds:
+-            py_limited_api = f"cp3{minor_version}"
+-            break
+-
+-    setup_kwargs.setdefault("options", {}).setdefault("bdist_wheel", {})[
+-        "py_limited_api"
+-    ] = py_limited_api
+diff --git a/rust/Cargo.toml b/rust/Cargo.toml
+index 8199a4e02b..9eae4cc297 100644
+--- a/rust/Cargo.toml
++++ b/rust/Cargo.toml
+@@ -33,8 +33,6 @@ mime = "0.3.17"
+ pyo3 = { version = "0.27.2", features = [
+     "macros",
+     "anyhow",
+-    "abi3",
+-    "abi3-py310",
+     # So we can pass `bytes::Bytes` directly back to Python efficiently,
+     # https://docs.rs/pyo3/latest/pyo3/bytes/index.html
+     "bytes",
+-- 
+2.53.0
+

diff --git a/0002-Build-RustExtension-with-debug-symbols.patch b/0002-Build-RustExtension-with-debug-symbols.patch
new file mode 100644
index 0000000..68f2198
--- /dev/null
+++ b/0002-Build-RustExtension-with-debug-symbols.patch
@@ -0,0 +1,33 @@
+From 6452deb91594dd1ba8b2ed27e937033110c19f54 Mon Sep 17 00:00:00 2001
+From: "Kai A. Hiller" <V02460@gmail.com>
+Date: Wed, 29 Mar 2023 12:28:31 +0200
+Subject: [PATCH 2/2] Build RustExtension with debug symbols
+
+---
+ build_rust.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/build_rust.py b/build_rust.py
+index 65d9ac301d..ecc98a5ec8 100644
+--- a/build_rust.py
++++ b/build_rust.py
+@@ -3,7 +3,7 @@
+ import os
+ from typing import Any
+ 
+-from setuptools_rust import Binding, RustExtension
++from setuptools_rust import Binding, RustExtension, Strip
+ 
+ 
+ def build(setup_kwargs: dict[str, Any]) -> None:
+@@ -19,6 +19,7 @@ def build(setup_kwargs: dict[str, Any]) -> None:
+         # We always build in release mode, as we can't distinguish
+         # between using `poetry` in development vs production.
+         debug=False,
++        strip=Strip.No,
+     )
+     setup_kwargs.setdefault("rust_extensions", []).append(extension)
+     setup_kwargs["zip_safe"] = False
+-- 
+2.51.1
+

             reply	other threads:[~2026-09-16 21:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-16 21:36 Gwyn Ciesla [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-09-03 19:43 [rpms/matrix-synapse] f45: Merge branch 'rawhide' into f45 Gwyn Ciesla
2026-08-27 18:56 Gwyn Ciesla

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178959461460.1.3609865048915880233.rpms-matrix-synapse-a345a0cad158@fedoraproject.org \
    --to=gwync@protonmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox