diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-11-20 03:02:59 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-20 03:02:59 +0000 |
| commit | 8a5f3383bbc5f817d89554020a3600d06985bc4a (patch) | |
| tree | c1f7e85e7de87c74b4c730fab5369051cef5cb32 /dev-python/pygit2 | |
| parent | f2e359c456b051f95efc92e21299d55a302e58ed (diff) | |
gentoo auto-resync : 20:11:2024 - 03:02:59
Diffstat (limited to 'dev-python/pygit2')
| -rw-r--r-- | dev-python/pygit2/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/pygit2/files/pygit2-1.16.0-gcc-14.patch | 37 | ||||
| -rw-r--r-- | dev-python/pygit2/pygit2-1.16.0.ebuild | 6 |
3 files changed, 45 insertions, 1 deletions
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest index 6e39372bf000..23101abe1f14 100644 --- a/dev-python/pygit2/Manifest +++ b/dev-python/pygit2/Manifest @@ -1,3 +1,4 @@ +AUX pygit2-1.16.0-gcc-14.patch 1551 BLAKE2B 01f3102394b3b0e24e3bb5ccbae669a6419ebee37745722ce924c135c3a47150b44a298e979af5574cf15ba567874c0dc7bfca638b9a09b30a7f6030b754da02 SHA512 ef1a05610bbb12e2fc249fbfe4957ea99b2b203154cfd3a18505d58145d4bb79e011499c3d6ce609782a7cf483ac8f1a7d0583cf8f619d9e5eeb65f00633882f DIST pygit2-1.16.0.tar.gz 768597 BLAKE2B 30e8df4c3f992e075117bdcda3d84e2ed0618dd8556ae8574f6238992cacff69ec3c7c22a6ab85f7857156fbb4b3e6e75bc899e71ea59efcb1f8dee61687355f SHA512 297fc46f2e48e77937718e54b3ef2bb41a252348173fc5858ab4225fc3403a4d29efd2d6377508220d8bdf901f6cd9595c31601d8c0f77e9dc9a44f159a1d278 -EBUILD pygit2-1.16.0.ebuild 831 BLAKE2B 40594d2f970b9cf768f5df6f05acb75339b8f253e74b88dd036ef75f62e676d035aa816de6364a8578c9fdb862ec7c584c0afc414fd605627a7a8c0cde368ed3 SHA512 cdd595ccc924dd81625344c8c67e8be32e03a4bbdf07095d8b3d231239a1f8a26cc1df9f73084729afbec7bca527cfe114fae997136ffb1b7eae370b88ff9dca +EBUILD pygit2-1.16.0.ebuild 1007 BLAKE2B 17623bb4d245861ffa7f76d8264f4d2ae988ea60c58bc87ec7f894737fdded66491af64504bb18971186a09cb748dd3ff598e3b0eda1ef548905174284767511 SHA512 2cf26dbef104d58e0f4b4e4af5e3de3983a062b31fe5621404472aa07c57eaef28a3354a97dafc56b6aa0d5c6e66e4ac116f65877b54c64efa386c5348d05a18 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39 diff --git a/dev-python/pygit2/files/pygit2-1.16.0-gcc-14.patch b/dev-python/pygit2/files/pygit2-1.16.0-gcc-14.patch new file mode 100644 index 000000000000..5bcd93320585 --- /dev/null +++ b/dev-python/pygit2/files/pygit2-1.16.0-gcc-14.patch @@ -0,0 +1,37 @@ +From eba710e45bb40e18641c6531394bb46631e7f295 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@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; diff --git a/dev-python/pygit2/pygit2-1.16.0.ebuild b/dev-python/pygit2/pygit2-1.16.0.ebuild index d6fdc0982742..87c95816f425 100644 --- a/dev-python/pygit2/pygit2-1.16.0.ebuild +++ b/dev-python/pygit2/pygit2-1.16.0.ebuild @@ -34,6 +34,12 @@ RDEPEND=" distutils_enable_tests pytest src_prepare() { + local PATCHES=( + # https://bugs.gentoo.org/942207 + # https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295 + "${FILESDIR}/${P}-gcc-14.patch" + ) + distutils-r1_src_prepare # unconditionally prevent it from using network |