diff options
Diffstat (limited to 'poky/meta/recipes-devtools/librepo')
-rw-r--r-- | poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch | 21 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/librepo/librepo_1.16.0.bb (renamed from poky/meta/recipes-devtools/librepo/librepo_1.15.1.bb) | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch index d61d8fbf85..a0a4d490f1 100644 --- a/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +++ b/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch @@ -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 + diff --git a/poky/meta/recipes-devtools/librepo/librepo_1.15.1.bb b/poky/meta/recipes-devtools/librepo/librepo_1.16.0.bb index 2c8d6fc719..4710a6b72a 100644 --- a/poky/meta/recipes-devtools/librepo/librepo_1.15.1.bb +++ b/poky/meta/recipes-devtools/librepo/librepo_1.16.0.bb @@ -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 = "5f4de4a4e85845d4184fbd30c03ff8a8ec7df4af" +SRCREV = "7c9af219abd49f8961542b7622fc82cfdaa572e3" S = "${WORKDIR}/git" |