From 2aac03674099417a07537e35c683437e13a42e8fcf7fa13adf140eba93a59dfa Mon Sep 17 00:00:00 2001 From: Git SCM Staging Date: Tue, 5 Nov 2024 11:34:35 +0000 Subject: [PATCH 1/4] [info=196021276a72dada032fdf877abaa053e1818855548022aef73e40a9617bd4ca] OBS-URL: https://build.opensuse.org/package/show/devel:Factory:git-workflow:staging:mcepl:python-pygit2:2/python-pygit2?expand=0&rev=1 --- _scmsync.obsinfo | 4 ++++ build.specials.obscpio | 3 +++ const-parents.patch | 27 +++++++++++++++++++++++++++ pygit2-1.15.1.tar.gz | 3 --- pygit2-1.16.0.tar.gz | 3 +++ python-pygit2.changes | 15 +++++++++++++++ python-pygit2.spec | 16 +++++++--------- 7 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 const-parents.patch delete mode 100644 pygit2-1.15.1.tar.gz create mode 100644 pygit2-1.16.0.tar.gz diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..a820e34 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1730806374 +commit: 196021276a72dada032fdf877abaa053e1818855548022aef73e40a9617bd4ca +url: https://src.opensuse.org/mcepl/python-pygit2.git +revision: 196021276a72dada032fdf877abaa053e1818855548022aef73e40a9617bd4ca diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..efbe256 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:190f5654559b6146329ea81555b2006807e6a5baa7fd64f577f60533cb368f77 +size 280 diff --git a/const-parents.patch b/const-parents.patch new file mode 100644 index 0000000..2669549 --- /dev/null +++ b/const-parents.patch @@ -0,0 +1,27 @@ + +--- + 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/pygit2-1.15.1.tar.gz b/pygit2-1.15.1.tar.gz deleted file mode 100644 index 94277a1..0000000 --- a/pygit2-1.15.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1fe8b85053d9713043c81eccc74132f9e5b603f209e80733d7955eafd22eb9d -size 768818 diff --git a/pygit2-1.16.0.tar.gz b/pygit2-1.16.0.tar.gz new file mode 100644 index 0000000..586d40d --- /dev/null +++ b/pygit2-1.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b29a6796baa15fc89d443ac8d51775411d9b1e5b06dc40d458c56c8576b48a2 +size 768597 diff --git a/python-pygit2.changes b/python-pygit2.changes index 6486fca..9680a02 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 5 10:50:38 UTC 2024 - Matej Cepl + +- Update to 1.16.0: + - Add support for Python 3.13 + - Drop support for Python 3.9 + - New Repository.hashfile(...) + - New Option.GET_MWINDOW_FILE_LIMIT and + Option.SET_MWINDOW_FILE_LIMIT + - Fix overriding certificate_check(...) callback via argument + to RemoteCallbacks(...) + - Add py.typed + - Fix discover_repository(...) annotation +- Add const-parents.patch to fix FTBFS (gh#libgit2/pygit2!1324). + ------------------------------------------------------------------- Mon Aug 5 11:21:06 UTC 2024 - John Paul Adrian Glaubitz diff --git a/python-pygit2.spec b/python-pygit2.spec index c424806..7f7f63e 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -19,14 +19,18 @@ %{?sle15_python_module_pythons} Name: python-pygit2 -Version: 1.15.1 +Version: 1.16.0 Release: 0 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.16.0} +BuildRequires: %{python_module cffi >= 1.17.0} BuildRequires: %{python_module devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} @@ -39,7 +43,7 @@ BuildRequires: libgit2-devel >= 1.1 BuildRequires: libopenssl-devel BuildRequires: python-rpm-macros Requires: python-cached-property -%requires_eq python-cffi +Requires: python-cffi >= 1.17.0 %python_subpackages %description @@ -47,12 +51,6 @@ Bindings for libgit2, a linkable C library for the Git version-control system. %prep %autosetup -p1 -n pygit2-%{version} -%if %{?pkg_vcmp:%pkg_vcmp libgit2-devel < 1.8}%{!?pkg_vcmp:1} -%patch -P 3 -p1 -R -%patch -P 2 -p1 -R -%patch -P 1 -p1 -R -%patch -P 0 -p1 -R -%endif # do not add options to pytest rm pytest.ini From 0de7481d05d3012619384545ab527808d6601ec0566f870a69099f652db59e8a Mon Sep 17 00:00:00 2001 From: Git SCM Staging Date: Tue, 5 Nov 2024 12:44:06 +0000 Subject: [PATCH 2/4] [info=f5cc8fe3ef04e9b1df5cb981df4c43ac7d52c00b4080d07075cb899be178dcae] OBS-URL: https://build.opensuse.org/package/show/devel:Factory:git-workflow:staging:mcepl:python-pygit2:2/python-pygit2?expand=0&rev=2 --- _scmsync.obsinfo | 6 +++--- build.specials.obscpio | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index a820e34..6555c31 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1730806374 -commit: 196021276a72dada032fdf877abaa053e1818855548022aef73e40a9617bd4ca +mtime: 1730810625 +commit: f5cc8fe3ef04e9b1df5cb981df4c43ac7d52c00b4080d07075cb899be178dcae url: https://src.opensuse.org/mcepl/python-pygit2.git -revision: 196021276a72dada032fdf877abaa053e1818855548022aef73e40a9617bd4ca +revision: f5cc8fe3ef04e9b1df5cb981df4c43ac7d52c00b4080d07075cb899be178dcae diff --git a/build.specials.obscpio b/build.specials.obscpio index efbe256..8740d84 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:190f5654559b6146329ea81555b2006807e6a5baa7fd64f577f60533cb368f77 +oid sha256:0e7e8db858273ffd00a356a63ea1754f840ee8519e5e1aeb2ae8e065317ef582 size 280 From 878a18abd8b6838a7ab8cda63fe0405051f0d245118dc2907a4aaad3f5ea3618 Mon Sep 17 00:00:00 2001 From: Git SCM Staging Date: Tue, 5 Nov 2024 12:45:09 +0000 Subject: [PATCH 3/4] [info=3e07cb6faef98760b11addef0c42d0d294cfa921029306ca19a987bbda9ba12b] OBS-URL: https://build.opensuse.org/package/show/devel:Factory:git-workflow:staging:mcepl:python-pygit2:2/python-pygit2?expand=0&rev=3 --- _scmsync.obsinfo | 6 +++--- build.specials.obscpio | 2 +- const-parents.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 6555c31..e2b605c 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1730810625 -commit: f5cc8fe3ef04e9b1df5cb981df4c43ac7d52c00b4080d07075cb899be178dcae +mtime: 1730810698 +commit: 3e07cb6faef98760b11addef0c42d0d294cfa921029306ca19a987bbda9ba12b url: https://src.opensuse.org/mcepl/python-pygit2.git -revision: f5cc8fe3ef04e9b1df5cb981df4c43ac7d52c00b4080d07075cb899be178dcae +revision: 3e07cb6faef98760b11addef0c42d0d294cfa921029306ca19a987bbda9ba12b diff --git a/build.specials.obscpio b/build.specials.obscpio index 8740d84..0192414 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e7e8db858273ffd00a356a63ea1754f840ee8519e5e1aeb2ae8e065317ef582 +oid sha256:917a491ff85ea1cdb720bdc4e4ccb16a5afc93d92f8f126aa6f27ded38479f04 size 280 diff --git a/const-parents.patch b/const-parents.patch index 2669549..48e2fcc 100644 --- a/const-parents.patch +++ b/const-parents.patch @@ -11,7 +11,7 @@ py_author->signature, py_committer->signature, - encoding, message, tree, parent_count, parents); + encoding, message, tree, parent_count, -+ (const git_commit **)parents); ++ (git_commit * const*)parents); if (err < 0) { Error_set(err); goto out; @@ -21,7 +21,7 @@ py_author->signature, py_committer->signature, - encoding, message, tree, parent_count, parents); + encoding, message, tree, parent_count, -+ (const git_commit **)parents); ++ (git_commit * const*)parents); if (err < 0) { Error_set(err); goto out; From c42d629af5c5f134dc216667f6dee104905f79362a3a9868579d51d32e76659c Mon Sep 17 00:00:00 2001 From: Git SCM Staging Date: Tue, 5 Nov 2024 12:48:56 +0000 Subject: [PATCH 4/4] [info=8f774c3b9f40d04f66a46759d57c82ef5d71a8e1989bc375a9493ec49c78810e] OBS-URL: https://build.opensuse.org/package/show/devel:Factory:git-workflow:staging:mcepl:python-pygit2:2/python-pygit2?expand=0&rev=4 --- _scmsync.obsinfo | 6 +++--- build.specials.obscpio | 2 +- const-parents.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index e2b605c..1ee5bc6 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1730810698 -commit: 3e07cb6faef98760b11addef0c42d0d294cfa921029306ca19a987bbda9ba12b +mtime: 1730806374 +commit: 8f774c3b9f40d04f66a46759d57c82ef5d71a8e1989bc375a9493ec49c78810e url: https://src.opensuse.org/mcepl/python-pygit2.git -revision: 3e07cb6faef98760b11addef0c42d0d294cfa921029306ca19a987bbda9ba12b +revision: 8f774c3b9f40d04f66a46759d57c82ef5d71a8e1989bc375a9493ec49c78810e diff --git a/build.specials.obscpio b/build.specials.obscpio index 0192414..d59e4d7 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:917a491ff85ea1cdb720bdc4e4ccb16a5afc93d92f8f126aa6f27ded38479f04 +oid sha256:5679ea7608681403ab243a0f778be1990c99f5a64cfe201fa19ad3ba56bd9592 size 280 diff --git a/const-parents.patch b/const-parents.patch index 48e2fcc..2669549 100644 --- a/const-parents.patch +++ b/const-parents.patch @@ -11,7 +11,7 @@ py_author->signature, py_committer->signature, - encoding, message, tree, parent_count, parents); + encoding, message, tree, parent_count, -+ (git_commit * const*)parents); ++ (const git_commit **)parents); if (err < 0) { Error_set(err); goto out; @@ -21,7 +21,7 @@ py_author->signature, py_committer->signature, - encoding, message, tree, parent_count, parents); + encoding, message, tree, parent_count, -+ (git_commit * const*)parents); ++ (const git_commit **)parents); if (err < 0) { Error_set(err); goto out;