From 3ce40697d0b5942f7c69f73b7b7f7cdf72b897fa Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 28 Feb 2021 16:36:47 +0100 Subject: librepo: update 1.12.1 -> 1.13.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | 38 ++++++---------------- ...ariables-with-pkg-config-not-with-cmake-m.patch | 8 ++--- meta/recipes-devtools/librepo/librepo_1.12.1.bb | 29 ----------------- meta/recipes-devtools/librepo/librepo_1.13.0.bb | 29 +++++++++++++++++ 4 files changed, 43 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-devtools/librepo/librepo_1.12.1.bb create mode 100644 meta/recipes-devtools/librepo/librepo_1.13.0.bb diff --git a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch index b61f0c9324..46ab9a1132 100644 --- a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +++ b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch @@ -1,4 +1,4 @@ -From b08a3b71e716dd0485ef51036d32e4c304fb4e67 Mon Sep 17 00:00:00 2001 +From 82bd6d196a0453657cbacaaedd75b2d2fe0bf9ba Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:05:36 +0200 Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python. @@ -7,35 +7,17 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- - librepo/python/python2/CMakeLists.txt | 12 ++++++------ - librepo/python/python3/CMakeLists.txt | 12 ++++++------ - 2 files changed, 12 insertions(+), 12 deletions(-) + librepo/python/CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) -diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt -index a0f1f9a..1665079 100644 ---- a/librepo/python/python2/CMakeLists.txt -+++ b/librepo/python/python2/CMakeLists.txt -@@ -1,9 +1,9 @@ --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " --from sys import stdout --from distutils import sysconfig --path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') --stdout.write(path)" --OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " -+#from sys import stdout -+#from distutils import sysconfig -+#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') -+#stdout.write(path)" -+#OUTPUT_VARIABLE PYTHON_INSTALL_DIR) - INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) +diff --git a/librepo/python/CMakeLists.txt b/librepo/python/CMakeLists.txt +index 52fc39e..2024407 100644 +--- a/librepo/python/CMakeLists.txt ++++ b/librepo/python/CMakeLists.txt +@@ -16,12 +16,12 @@ SET (librepomodule_SRCS + + MESSAGE("Building python bindings") - MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") -diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt -index 52ba44e..da51e10 100644 ---- a/librepo/python/python3/CMakeLists.txt -+++ b/librepo/python/python3/CMakeLists.txt -@@ -1,9 +1,9 @@ -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " -from sys import stdout -from distutils import sysconfig diff --git a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch index 73902e5f58..d61d8fbf85 100644 --- a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +++ b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch @@ -1,4 +1,4 @@ -From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001 +From 25113b34bc1aae377d7bf447e69528783e2c177e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:23:27 +0200 Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module @@ -12,13 +12,13 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e949dbe..c954b2e 100644 +index a45d5c4..40249e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) +@@ -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) - FIND_PACKAGE(CURL REQUIRED) + FIND_PACKAGE(CURL 7.52.0 REQUIRED) -FIND_PACKAGE(Gpgme REQUIRED) +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) diff --git a/meta/recipes-devtools/librepo/librepo_1.12.1.bb b/meta/recipes-devtools/librepo/librepo_1.12.1.bb deleted file mode 100644 index e90928d2ed..0000000000 --- a/meta/recipes-devtools/librepo/librepo_1.12.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A library providing C and Python (libcURL like) API \ - for downloading linux repository metadata and packages." -HOMEPAGE = "https://github.com/rpm-software-management/librepo" -DESCRIPTION = "${SUMMARY}" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "git://github.com/rpm-software-management/librepo.git \ - file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ - file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ - " - -SRCREV = "d4ad350291f2937c0b6a3eea9e1d0c8e1051fc32" - -S = "${WORKDIR}/git" - -DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" - -inherit cmake distutils3-base pkgconfig - -EXTRA_OECMAKE = " \ - -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ - -DPYTHON_DESIRED=3 \ - -DENABLE_TESTS=OFF \ - -DENABLE_DOCS=OFF \ - -DWITH_ZCHUNK=OFF \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/librepo/librepo_1.13.0.bb b/meta/recipes-devtools/librepo/librepo_1.13.0.bb new file mode 100644 index 0000000000..0a68e0ac4f --- /dev/null +++ b/meta/recipes-devtools/librepo/librepo_1.13.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "A library providing C and Python (libcURL like) API \ + for downloading linux repository metadata and packages." +HOMEPAGE = "https://github.com/rpm-software-management/librepo" +DESCRIPTION = "${SUMMARY}" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/rpm-software-management/librepo.git \ + file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ + file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ + " + +SRCREV = "a244d78bab11510408fb9413f1c78c2f56c69fa5" + +S = "${WORKDIR}/git" + +DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" + +inherit cmake distutils3-base pkgconfig + +EXTRA_OECMAKE = " \ + -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ + -DPYTHON_DESIRED=3 \ + -DENABLE_TESTS=OFF \ + -DENABLE_DOCS=OFF \ + -DWITH_ZCHUNK=OFF \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg