This commit is contained in:
Mario Fetka
2024-06-18 10:44:56 +02:00
parent 6a37474503
commit 20ef8b5c88
95 changed files with 4227 additions and 99 deletions

View File

@@ -0,0 +1,21 @@
From 04fc6081bd3d6575d00589f71150ab796778a9c9 Mon Sep 17 00:00:00 2001
From: Matthew Smith <matthew@gentoo.org>
Date: Mon, 20 Feb 2023 17:53:50 +0000
Subject: [PATCH] build: Remove Werror flag from clipper2
Bug: https://bugs.gentoo.org/895014
--- a/thirdparty/clipper2/CMakeLists.txt
+++ b/thirdparty/clipper2/CMakeLists.txt
@@ -27,7 +27,7 @@ target_compile_definitions(clipper2 PUBLIC USINGZ)
if (MSVC)
target_compile_options(clipper2 PRIVATE /W4 /WX)
else()
- target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
+ target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic)
target_link_libraries(clipper2 PUBLIC -lm)
endif()
--
2.39.2

View File

@@ -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