From: Gyorgy Sarvari <skandigraun@gmail.com>
Date: Fri, 18 Jul 2025 10:11:40 +0000 (+0200)
Subject: libgit2: upgrade 1.9.0 -> 1.9.1
X-Git-Tag: uninative-4.9~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92bfe7333748bf52a436f03452fecacd95b6b0bf;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

libgit2: upgrade 1.9.0 -> 1.9.1

Dropped 0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch
because it's included in this release.

Changelog: see https://github.com/libgit2/libgit2/releases/tag/v1.9.1

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch b/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch
deleted file mode 100644
index ae48524e0d4..00000000000
--- a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8ca35649c33d0d2fcdcd573ce6a9edd91c77e4da Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 7 Jan 2025 18:56:19 +0100
-Subject: [PATCH] src/libgit2/CMakeLists.txt: install cmake files into
- configured libdir
-
-libdir can be something else than /usr/lib, e.g. /usr/lib64 or similar.
-
-Upstream-Status: Submitted [https://github.com/libgit2/libgit2/pull/7004]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- src/libgit2/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
-index a7d3c7ca4..16b3a23d9 100644
---- a/src/libgit2/CMakeLists.txt
-+++ b/src/libgit2/CMakeLists.txt
-@@ -119,11 +119,11 @@ configure_file(config.cmake.in
- install(FILES
- 	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
- 	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
--	DESTINATION "lib/cmake/${PROJECT_NAME}")
-+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- install(
- 	EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME}
- 	NAMESPACE "${PROJECT_NAME}::"
--	DESTINATION "lib/cmake/${PROJECT_NAME}")
-+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- 
- # Install
- 
diff --git a/meta/recipes-support/libgit2/libgit2_1.9.0.bb b/meta/recipes-support/libgit2/libgit2_1.9.1.bb
similarity index 72%
rename from meta/recipes-support/libgit2/libgit2_1.9.0.bb
rename to meta/recipes-support/libgit2/libgit2_1.9.1.bb
index 66ec62f17ab..43957a2087b 100644
--- a/meta/recipes-support/libgit2/libgit2_1.9.0.bb
+++ b/meta/recipes-support/libgit2/libgit2_1.9.1.bb
@@ -5,10 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d"
 
 DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
 
-SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \
-           file://0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch \
-           "
-SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0"
+SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.9;protocol=https;tag=v${PV}"
+SRCREV = "0060d9cf5666f015b1067129bd874c6cc4c9c7ac"
 
 inherit cmake