From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69386158041 for ; Wed, 27 Mar 2024 11:41:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2287E2A3F; Wed, 27 Mar 2024 11:41:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 939B2E2A3F for ; Wed, 27 Mar 2024 11:41:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8ADE33F9FD for ; Wed, 27 Mar 2024 11:41:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 418A915C7 for ; Wed, 27 Mar 2024 11:41:27 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1711539670.ded5389f065b99454f2478b9559bf3a6dc43247f.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch sci-electronics/kicad/kicad-8.0.0.ebuild sci-electronics/kicad/kicad-8.0.1.ebuild X-VCS-Directories: sci-electronics/kicad/ sci-electronics/kicad/files/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: ded5389f065b99454f2478b9559bf3a6dc43247f X-VCS-Branch: master Date: Wed, 27 Mar 2024 11:41:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eb2f44d5-d537-45d1-91c1-fe9346a97b35 X-Archives-Hash: d61b7541918f1c5c51c90aa17d9f4914 commit: ded5389f065b99454f2478b9559bf3a6dc43247f Author: Huang Rui gmail com> AuthorDate: Fri Mar 22 11:22:21 2024 +0000 Commit: Yixun Lan gentoo org> CommitDate: Wed Mar 27 11:41:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded5389f sci-electronics/kicad: fix build error with libgit2-1.8.0 See also: https://gitlab.com/kicad/code/kicad/-/issues/17536 Closes: https://bugs.gentoo.org/927503 Closes: https://github.com/gentoo/gentoo/pull/35865 Signed-off-by: Huang Rui gmail.com> Signed-off-by: Yixun Lan gentoo.org> .../kicad/files/kicad-8.0.1-libgit2.patch | 36 ++++++++++++++++++++++ sci-electronics/kicad/kicad-8.0.0.ebuild | 4 +++ sci-electronics/kicad/kicad-8.0.1.ebuild | 4 +++ 3 files changed, 44 insertions(+) diff --git a/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch b/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch new file mode 100644 index 000000000000..d2523993e6fe --- /dev/null +++ b/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch @@ -0,0 +1,36 @@ +From: Huang Rui +Date: Fri, 22 Mar 2024 18:18:40 +0800 +Subject: [PATCH] libgit2-1.8.0 compatibility: adjusted parent pointer type + +- Adjusted parent pointer type in git_commit_create call for compatibility + with libgit2 1.8.0 and above. +- Included preprocessor checks to maintain support for versions older than + 1.8.0. +- Ensures consistent function behavior across different libgit2 versions. + +Fixes https://gitlab.com/kicad/code/kicad/-/issues/17536 +Signed-off-by: Huang Rui +--- + kicad/project_tree_pane.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/kicad/project_tree_pane.cpp ++++ b/kicad/project_tree_pane.cpp +@@ -2233,7 +2233,14 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent ) + } + + git_oid oid; ++ // Check if the libgit2 library version is 1.8.0 or higher ++#if ( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 ) ++ // For libgit2 version 1.8.0 and above ++ git_commit* const parents[1] = { parent }; ++#else ++ // For libgit2 versions older than 1.8.0 + const git_commit* parents[1] = { parent }; ++#endif + + if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr, commit_msg.mb_str(), tree, + 1, parents ) != 0 ) +-- +2.44.0 + diff --git a/sci-electronics/kicad/kicad-8.0.0.ebuild b/sci-electronics/kicad/kicad-8.0.0.ebuild index 8c9a6b4dc5eb..96b4a708d332 100644 --- a/sci-electronics/kicad/kicad-8.0.0.ebuild +++ b/sci-electronics/kicad/kicad-8.0.0.ebuild @@ -81,6 +81,10 @@ fi CHECKREQS_DISK_BUILD="1500M" +PATCHES=( + "${FILESDIR}"/${PN}-8.0.1-libgit2.patch +) + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/sci-electronics/kicad/kicad-8.0.1.ebuild b/sci-electronics/kicad/kicad-8.0.1.ebuild index 8c9a6b4dc5eb..96b4a708d332 100644 --- a/sci-electronics/kicad/kicad-8.0.1.ebuild +++ b/sci-electronics/kicad/kicad-8.0.1.ebuild @@ -81,6 +81,10 @@ fi CHECKREQS_DISK_BUILD="1500M" +PATCHES=( + "${FILESDIR}"/${PN}-8.0.1-libgit2.patch +) + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp