public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pygit2/, dev-python/pygit2/files/
Date: Tue, 19 Nov 2024 14:02:31 +0000 (UTC)	[thread overview]
Message-ID: <1732024948.1754434f5cb77275b97952e96dee0ed3364fb563.mgorny@gentoo> (raw)

commit:     1754434f5cb77275b97952e96dee0ed3364fb563
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 14:02:00 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 19 14:02:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1754434f

dev-python/pygit2: Backport gcc-14 build fix

Closes: https://bugs.gentoo.org/942207
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pygit2/files/pygit2-1.16.0-gcc-14.patch | 37 ++++++++++++++++++++++
 dev-python/pygit2/pygit2-1.16.0.ebuild             |  6 ++++
 2 files changed, 43 insertions(+)

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


             reply	other threads:[~2024-11-19 14:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-19 14:02 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-09-28  6:20 [gentoo-commits] repo/gentoo:master commit in: dev-python/pygit2/, dev-python/pygit2/files/ Michał Górny
2017-11-21 17:48 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1732024948.1754434f5cb77275b97952e96dee0ed3364fb563.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox