public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mercurial] rawhide: Drop fix-compat-with-python315.patch
@ 2026-06-30 19:10 Mads Kiilerich
  0 siblings, 0 replies; only message in thread
From: Mads Kiilerich @ 2026-06-30 19:10 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/mercurial
            Branch : rawhide
            Commit : ab85371221ce1e26cd20dd993273d6e313eeb105
            Author : Mads Kiilerich <mads@kiilerich.com>
            Date   : 2026-06-30T20:51:03+02:00
            Stats  : +0/-25 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/mercurial/c/ab85371221ce1e26cd20dd993273d6e313eeb105?branch=rawhide

            Log:
            Drop fix-compat-with-python315.patch

It is not clear what problem it fixed - I was never able to reproduce
the problem. It was supposed to fix a Python 3.15 build blocker, but it
seems to work fine without it now.

---
diff --git a/fix-compat-with-python315.patch b/fix-compat-with-python315.patch
deleted file mode 100644
index 85c970e..0000000
--- a/fix-compat-with-python315.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a9faa827e7c686f92ddc53e87a057f554298ad10 Mon Sep 17 00:00:00 2001
-From: Karolina Surma <ksurma@redhat.com>
-Date: Thu, 21 May 2026 16:49:41 +0200
-Subject: [PATCH] Fix build with Python 3.15.0b1
-
----
- hgdemandimport/__init__.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hgdemandimport/__init__.py b/hgdemandimport/__init__.py
---- a/hgdemandimport/__init__.py
-+++ b/hgdemandimport/__init__.py
-@@ -74,6 +74,8 @@ IGNORES = {
-     # importlib.util.LazyLoader that demandimportpy3 uses.
-     'heapq',
-     'copy',
-+    'tomllib._re',
-+    'inspect',
- }
- 
- _pypy = '__pypy__' in sys.builtin_module_names
--- 
-2.54.0
-

diff --git a/mercurial.spec b/mercurial.spec
index deabe6a..5e19533 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -23,7 +23,6 @@ Source0: https://www.mercurial-scm.org/release/%{name}-%{upstreamversion}.tar.gz
 Source1: mercurial-site-start.el
 # Patch cargo metadata for dependency versions available in Fedora
 Patch0:  mercurial-rust-metadata.patch
-Patch1:  fix-compat-with-python315.patch
 
 BuildRequires: make
 BuildRequires: emacs-el

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-30 19:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-30 19:10 [rpms/mercurial] rawhide: Drop fix-compat-with-python315.patch Mads Kiilerich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox