From 4aef53575bdb9d1e74ca5600eb93079964d2e8fd Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 5 May 2023 16:49:17 +0200 Subject: [PATCH] package/libgit2: bump version to 1.6.4 * Remove patch applied upstream. * Upstream fixed building inside the source tree, but still does not recommend it, so keep LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO Signed-off-by: Nicolas Cavallari Signed-off-by: Yann E. MORIN --- ...clare-win32-functions-on-non-win32-p.patch | 35 ------------------- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch diff --git a/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch b/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch deleted file mode 100644 index 6be66ffee3..0000000000 --- a/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 20811c5aa9c528405eaa3f88ff22a9adebafa9e6 Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Wed, 8 Mar 2023 14:00:52 +0100 -Subject: [PATCH] sysdir: Do not declare win32 functions on non-win32 platforms - -These declaration poses problems on some embedded or retro Linux systems -that deliberately disable support for wchar_t from their libc. - -Signed-off-by: Nicolas Cavallari -[Retrieved from: -https://github.com/libgit2/libgit2/commit/20811c5aa9c528405eaa3f88ff22a9adebafa9e6] ---- - src/libgit2/sysdir.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libgit2/sysdir.h b/src/libgit2/sysdir.h -index 1d15bbf43..03f59e1de 100644 ---- a/src/libgit2/sysdir.h -+++ b/src/libgit2/sysdir.h -@@ -134,10 +134,12 @@ extern int git_sysdir_set(git_sysdir_t which, const char *paths); - */ - extern int git_sysdir_reset(void); - -+#ifdef GIT_WIN32 - /** Sets the registry system dir to a mock; for testing. */ - extern int git_win32__set_registry_system_dir(const wchar_t *mock_sysdir); - - /** Find the given system dir; for testing. */ - extern int git_win32__find_system_dirs(git_str *out, const char *subdir); -+#endif - - #endif --- -2.39.2 - diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index baf43c66f7..4dd6519ca3 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d557fbf35557bb5df53cbf38ae0081edb4a36494ec0d19741fa673e509245f8f libgit2-1.6.2.tar.gz +sha256 d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d libgit2-1.6.4.tar.gz sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index b31f5199e1..9ddf2374bb 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.6.2 +LIBGIT2_VERSION = 1.6.4 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \