mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
librepo: upgrade 1.15.2 -> 1.16.0
Changelog: Implement OpenPGP using librpm API 0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch refreshed for 1.16.0 (From OE-Core rev: 05617d5636d3712c4374cf3590ff123f63e8e26a) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
05d0677c5a
commit
29362665c8
@@ -12,16 +12,19 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a45d5c4..40249e6 100644
|
||||
index cd975a8..713cc87 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -32,7 +32,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
|
||||
PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
|
||||
PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
|
||||
@@ -35,7 +35,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
|
||||
FIND_PACKAGE(CURL 7.52.0 REQUIRED)
|
||||
-FIND_PACKAGE(Gpgme REQUIRED)
|
||||
+PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
|
||||
+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
|
||||
|
||||
|
||||
IF (WITH_ZCHUNK)
|
||||
IF (USE_GPGME)
|
||||
- FIND_PACKAGE(Gpgme REQUIRED)
|
||||
+ PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
|
||||
+ set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
|
||||
ELSE (USE_GPGME)
|
||||
PKG_CHECK_MODULES(RPM REQUIRED rpm>=4.18.0)
|
||||
ENDIF (USE_GPGME)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;pr
|
||||
file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
|
||||
"
|
||||
|
||||
SRCREV = "1a0a5fd2b040d00872118b32d09d1f79730897a2"
|
||||
SRCREV = "7c9af219abd49f8961542b7622fc82cfdaa572e3"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user