gentoo auto-resync : 27:03:2024 - 13:01:55

4 files changed, 47 insertions, 2 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 40932051da06..0c73843052c0 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1,5 @@
 AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
+AUX kicad-8.0.1-libgit2.patch 1329 BLAKE2B 2e9b8f5d498b60feafdbf658b05350611e67b6449412c5e8b5b2d0a3b3bacc04ced8a6f5a7d3333221c36756b43ddfe95e41f6e98fca6fe010022bc8495d71c7 SHA512 1842a255ebfea314b6880ccd00f4a9693cf288e8dec09a51e8f9da42b14e602e4bf668deadcbf216c05a1f4650723db01e2df3033ed29c6df9a7c2c8a3a5f2eb
 DIST kicad-7.0.10.tar.bz2 43991960 BLAKE2B 3e21f575e41a6036ff2a9c3ab17472e51c73612ddadbf88631717b43024e604a8607fff013828823ff4db4d4263ac8e3bcc3b069e3efdfdc66fdb627f60f192a SHA512 f8005e6cb685c4cdc3982eec644f6d4a115138eaa19ca0bd2e6ae07613eac9c98fd7cdc181dd83e6c6d3c4b73ff6a54261ac5448a2a9c53298bc611c1bf408e1
 DIST kicad-7.0.11.tar.bz2 44083805 BLAKE2B d923581f49b3cf48776de56ba12ddc99e942269c0c14950bb6b3413fb616af74a1b4e7095fc746e20125096f7d2e4c7a9f271dd58918b22fa53e8ce7b78fa6f6 SHA512 28d5560ead989dcfb6d3b07e37443de3bf1883bd56604ae20f70c0a068504fd8745f7011507d417f487b86071cec130ac8eb7bda7513d096e78dcc3dc98585aa
 DIST kicad-7.0.7.tar.bz2 44055973 BLAKE2B 4169e111b8d2086572aa2979f09a8119dbc9caf34790ec5e5f3e0972d0a2e93dab6a1c814dc35ae40d5962e7ba93bad83d5930e9dba9b9f2e52f307378519714 SHA512 82eff4a16847c657ae3102af7914539bf7404e8856ca8c94557533a3ddd7b40ff4571b351dab48349d503d413cf293880245a97238516add83e79890325f1067
@@ -7,7 +8,7 @@ DIST kicad-8.0.1.tar.bz2 72453098 BLAKE2B 67c6b69256566a176ae10affa7ac65879db71f
 EBUILD kicad-7.0.10.ebuild 4362 BLAKE2B 28406e5f84731d8570940026cc91e8e347ad7a694dbb3538f4ff1822302c0132894a7208db807793bcc0986c58224a79f3cf6bb05c206a699f9a102ecdf3a5bc SHA512 5ab394782cb40651fc112f3b4b20b19d7fa8900af5596e76b5bcfd3876732497800a9f4a2adf477700da26fb1e2c84da47b6f7ebe3883f6d0736d2112df36603
 EBUILD kicad-7.0.11.ebuild 4363 BLAKE2B 337e3e5bdb66b3735777b1362d0a0cee45fe8b73dc159cb28e918956e7057746c45adc61a1935a88cdc8aa233657984399380bdf63c6cf18fe88dab24fc3a451 SHA512 2ee86ef232c2b42142f5991ad3e84713a3a1ba591d39844cbe8f964fd6cfe8f5864f135fc451b28c8341cf01f6f5584f83fd4d86458e8cb4ac0b6fee7a9517ca
 EBUILD kicad-7.0.7.ebuild 4320 BLAKE2B 05b44e10a0a360a061fe7c1a5c44d72a39b6a158d4c3e013c47dcff8c545cb3741ecc847aad53fc4b9745089763ff4408d270112473f8aeb701fa2bf9c5c886a SHA512 bef889e4e25aa3285ee3d3df6c04d45446b6fbcecf076a391a8021d0e97d53efb11385abe889fb83db16f6cd2cb0b3c0eb466e8e9453a154c03c52ca29685a11
-EBUILD kicad-8.0.0.ebuild 4437 BLAKE2B d97a81e37f42b0f68be095a4662c73dbcdaed9de4707f49dccec9bad8cfe7c88b577ce7241a4aea831b674753a4bc37570bef8ded4ac8592d350466d947374b3 SHA512 cb4639175d6a547643e40b54e71b6cff07e024bf16f85163cf1b5fb5d3b9193e21680e7e1f30770570d012a59af35ed7368c5ae2ff07c3a8e531e34c1f71646d
-EBUILD kicad-8.0.1.ebuild 4437 BLAKE2B d97a81e37f42b0f68be095a4662c73dbcdaed9de4707f49dccec9bad8cfe7c88b577ce7241a4aea831b674753a4bc37570bef8ded4ac8592d350466d947374b3 SHA512 cb4639175d6a547643e40b54e71b6cff07e024bf16f85163cf1b5fb5d3b9193e21680e7e1f30770570d012a59af35ed7368c5ae2ff07c3a8e531e34c1f71646d
+EBUILD kicad-8.0.0.ebuild 4491 BLAKE2B 22f7bc921702b5fe31476490f2f54429267a216cc0225a84194b3833ba214fc33661670976abfe5fef8a7ee7bcbc0b22064e3f655ca2c60bee6c49d86a7a8bf0 SHA512 5f02334b65afebc68beb8417d8640ed5df8640687007d50041220a5ece62c997f7ec8f007f35ec7f98fc169a00fda947e8b641ce3c6c1a2d9deadeaf716e622b
+EBUILD kicad-8.0.1.ebuild 4491 BLAKE2B 22f7bc921702b5fe31476490f2f54429267a216cc0225a84194b3833ba214fc33661670976abfe5fef8a7ee7bcbc0b22064e3f655ca2c60bee6c49d86a7a8bf0 SHA512 5f02334b65afebc68beb8417d8640ed5df8640687007d50041220a5ece62c997f7ec8f007f35ec7f98fc169a00fda947e8b641ce3c6c1a2d9deadeaf716e622b
 EBUILD kicad-9999.ebuild 4437 BLAKE2B d97a81e37f42b0f68be095a4662c73dbcdaed9de4707f49dccec9bad8cfe7c88b577ce7241a4aea831b674753a4bc37570bef8ded4ac8592d350466d947374b3 SHA512 cb4639175d6a547643e40b54e71b6cff07e024bf16f85163cf1b5fb5d3b9193e21680e7e1f30770570d012a59af35ed7368c5ae2ff07c3a8e531e34c1f71646d
 MISC metadata.xml 811 BLAKE2B 4f2150b49b1bebf73aa3440ae1ace1624ce02e022d361051e895a18d28f2ab802fed04c94552b36fc0265335a1eacd5d3a7c407fc88f0c4f7de9e4fa6afa6c5f SHA512 c09c2143516f361a8553ab5c44ffa47c77c7a8dbf53596dfe9ba81378c1a7e3aee8378353950cd8805b675d0a29444848fddd4acfe107a54e3f56e87183a1c6c
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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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