[packages/elektra] fix libgit2 version detection

atler atler at pld-linux.org
Sun Aug 27 01:56:42 CEST 2023


commit cd24b5dac32543db36b820902420ce5d87356e1e
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Aug 26 23:56:57 2023 +0200

    fix libgit2 version detection

 elektra.spec         |  2 ++
 libgit2-detect.patch | 11 +++++++++++
 2 files changed, 13 insertions(+)
---
diff --git a/elektra.spec b/elektra.spec
index 754324c..635bd3c 100644
--- a/elektra.spec
+++ b/elektra.spec
@@ -41,6 +41,7 @@ Patch3:		gcc11.patch
 Patch4:		%{name}-gpgme.patch
 Patch5:		%{name}-jni.patch
 Patch6:		%{name}-system-gtest.patch
+Patch7:		libgit2-detect.patch
 URL:		https://www.libelektra.org/
 %if %{with qt}
 BuildRequires:	Qt5Core-devel >= 5.3
@@ -536,6 +537,7 @@ Wiązanie języka Ruby dla Elektry.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' $(grep -l '/usr/bin/env bash' -r scripts)
 %{__sed} -i -e '1s,/usr/bin/env sh,/bin/sh,' scripts/check-env-dep
diff --git a/libgit2-detect.patch b/libgit2-detect.patch
new file mode 100644
index 0000000..36b5bef
--- /dev/null
+++ b/libgit2-detect.patch
@@ -0,0 +1,11 @@
+--- elektra-0.8.26/cmake/Modules/FindLibGit2.cmake.orig	2019-02-26 12:45:46.000000000 +0100
++++ elektra-0.8.26/cmake/Modules/FindLibGit2.cmake	2023-08-26 23:29:23.468868236 +0200
+@@ -15,7 +15,7 @@
+ if (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND)
+ 	file (STRINGS ${LibGit2_VERSION_HEADER}
+ 		      LibGit2_VERSION
+-	      REGEX "#define LIBGIT2_VERSION \".+\""
++	      REGEX "#define[\t ]+LIBGIT2_VERSION[\t ]+\".+\""
+ 	      LIMIT_COUNT 1)
+ 	string (REGEX
+ 		REPLACE ".*\"(.+)\""
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/elektra.git/commitdiff/cd24b5dac32543db36b820902420ce5d87356e1e



More information about the pld-cvs-commit mailing list