From d67fc870797df105dad42333f76e4a60bb1a26f372e11185d7754fd82a722a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Wed, 29 Jan 2025 14:53:03 +0100 Subject: [PATCH] Remove upstreamed const-parents.patch. --- const-parents.patch | 27 --------------------------- python-pygit2.changes | 5 +++++ python-pygit2.spec | 3 --- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 const-parents.patch diff --git a/const-parents.patch b/const-parents.patch deleted file mode 100644 index 2669549..0000000 --- a/const-parents.patch +++ /dev/null @@ -1,27 +0,0 @@ - ---- - src/repository.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/src/repository.c -+++ b/src/repository.c -@@ -1065,7 +1065,8 @@ Repository_create_commit(Repository *sel - - err = git_commit_create(&oid, self->repo, update_ref, - py_author->signature, py_committer->signature, -- encoding, message, tree, parent_count, parents); -+ encoding, message, tree, parent_count, -+ (const git_commit **)parents); - if (err < 0) { - Error_set(err); - goto out; -@@ -1147,7 +1148,8 @@ Repository_create_commit_string(Reposito - - err = git_commit_create_buffer(&buf, self->repo, - py_author->signature, py_committer->signature, -- encoding, message, tree, parent_count, parents); -+ encoding, message, tree, parent_count, -+ (const git_commit **)parents); - if (err < 0) { - Error_set(err); - goto out; diff --git a/python-pygit2.changes b/python-pygit2.changes index 71d9e9d..587223e 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 29 13:52:23 UTC 2025 - Matej Cepl + +- Remove upstreamed const-parents.patch. + ------------------------------------------------------------------- Tue Jan 28 09:21:54 UTC 2025 - Markéta Machová diff --git a/python-pygit2.spec b/python-pygit2.spec index 3d3e89a..9f7e44a 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -25,9 +25,6 @@ Summary: Python bindings for libgit2 License: GPL-2.0-only URL: https://github.com/libgit2/pygit2 Source: https://files.pythonhosted.org/packages/source/p/pygit2/pygit2-%{version}.tar.gz -# PATCH-FIX-UPSTREAM const-parents.patch gh#libgit2/pygit2!1324 mcepl@suse.com -# use correct type of git_commit_create() function -Patch0: const-parents.patch BuildRequires: %{python_module base >= 3.10} BuildRequires: %{python_module cached-property} BuildRequires: %{python_module cffi >= 1.17.0}