commit 825f14af56f74235382332ae50125274b048cc86 Author: Jan Palus <at...@pld-linux.org> Date: Thu Dec 12 14:00:23 2024 +0100
up to 1.16.0 gcc14.patch | 37 +++++++++++++++++++++++++++++++++++++ python-pygit2.spec | 15 +++++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) --- diff --git a/python-pygit2.spec b/python-pygit2.spec index 3475d12..10ca650 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -8,18 +8,19 @@ Summary: Python bindings for libgit2 library Summary(pl.UTF-8): Wiązania Pythona do biblioteki libgit2 Name: python-%{module} -Version: 1.13.3 +Version: 1.16.0 Release: 1 License: GPL v2 with linking exception Group: Libraries/Python #Source0Download: https://pypi.org/simple/pygit2/ Source0: https://files.pythonhosted.org/packages/source/p/pygit2/%{pypi_name}-%{version}.tar.gz -# Source0-md5: 9363b49de112bd6648b4b1ffe7ac0f02 +# Source0-md5: 6badd46c191ecf776d24da5ed175790c +Patch0: gcc14.patch URL: https://pypi.org/project/pygit2/ BuildRequires: libgit2-devel >= 1.4 -BuildRequires: python3-cffi >= 1.16.0 -BuildRequires: python3-devel >= 1:3.7 -BuildRequires: python3-modules >= 1:3.7 +BuildRequires: python3-cffi >= 1.17.0 +BuildRequires: python3-devel >= 1:3.10 +BuildRequires: python3-modules >= 1:3.10 BuildRequires: python3-setuptools %{?with_tests:BuildRequires: python3-pytest} BuildRequires: rpm-pythonprov @@ -46,6 +47,7 @@ pygit2 to zbiór wiązań Pythona do biblioteki współdzielonej libgit2. %prep %setup -q -n %{module}-%{version} +%patch -P 0 -p1 %build %py3_build @@ -66,9 +68,10 @@ rm -rf $RPM_BUILD_ROOT %files -n python3-%{module} %defattr(644,root,root,755) -%doc AUTHORS.rst CHANGELOG.rst README.rst SPONSORS.rst +%doc AUTHORS.md CHANGELOG.md README.md SPONSORS.md %dir %{py3_sitedir}/pygit2 %{py3_sitedir}/pygit2/decl +%{py3_sitedir}/pygit2/py.typed %{py3_sitedir}/pygit2/*.py %{py3_sitedir}/pygit2/*.pyi %{py3_sitedir}/pygit2/__pycache__ diff --git a/gcc14.patch b/gcc14.patch new file mode 100644 index 0000000..5bcd933 --- /dev/null +++ b/gcc14.patch @@ -0,0 +1,37 @@ +From eba710e45bb40e18641c6531394bb46631e7f295 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mc...@cepl.eu> +Date: Tue, 5 Nov 2024 12:26:44 +0100 +Subject: [PATCH] fix: use correct type of the ninth parameter of + git_commit_create() + +It should be `const git_commit **`, not `git_commit **`. + +Breaks the build with GCC-14. +--- + src/repository.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/repository.c b/src/repository.c +index d1d42ecf..3b5d57a1 100644 +--- a/src/repository.c ++++ b/src/repository.c +@@ -1065,7 +1065,8 @@ Repository_create_commit(Repository *self, PyObject *args) + + 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(Repository *self, PyObject *args) + + 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; ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-pygit2.git/commitdiff/825f14af56f74235382332ae50125274b048cc86 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit