pool/kicad
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1163138 from home:StefanBruens:branches:electronics

Browse Source 
- Fix build with libgit2 >= 1.8.0, add
  libgit2-1.8.0-compatibility.patch

OBS-URL: https://build.opensuse.org/request/show/1163138
OBS-URL: https://build.opensuse.org/package/show/electronics/kicad?expand=0&rev=132
This commit is contained in:
Stefan Brüns 2024-03-27 19:44:35 +00:00 committed by Git OBS Bridge
parent 75614ac113
commit d6b97acd62
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kicad.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 27 16:40:26 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix build with libgit2 >= 1.8.0, add
libgit2-1.8.0-compatibility.patch
-------------------------------------------------------------------
Fri Mar 15 11:10:26 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

2
kicad.spec
View File

@ -32,6 +32,8 @@ Source: https://gitlab.com/kicad/code/kicad/-/archive/%{file_version}/ki
Patch1: https://gitlab.com/kicad/code/kicad/-/commit/81cb6d0c3fb92dd15f0a0e0d2d32337be1617399.patch#/fix_zone_fill_race.patch
# PATCH-FIX-UPSTREAM
Patch2: https://gitlab.com/kicad/code/kicad/-/commit/1c459e9a67151a6f028ac3a108b338e850126bfb.patch#/0001-Fix-triangulationValid-check-race-for-zone-fill.patch
# PATCH-FIX-UPSTREAM
Patch3: https://gitlab.com/kicad/code/kicad/-/merge_requests/1882.patch#/libgit2-1.8.0-compatibility.patch
BuildRequires: cmake >= 3.16
BuildRequires: fdupes

39
libgit2-1.8.0-compatibility.patch Normal file
View File

@ -0,0 +1,39 @@
From 0b2de7b7072b4b7d2fc577170024cd5326396681 Mon Sep 17 00:00:00 2001
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(+)
diff --git a/kicad/project_tree_pane.cpp b/kicad/project_tree_pane.cpp
index 6ac4b04034c..99ad026bc9c 100644
--- 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 )
--
GitLab