summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-11-21 14:57:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-22 12:02:57 +0000
commitcafdd25de0c09d0b09110b640ed9d4b82d42e06e (patch)
tree93f04212877a188b296df8c1c04d3d69d0821e11 /meta/recipes-devtools
parent27467678ae76ea44b37431da5e250ddcf8746099 (diff)
downloadpoky-cafdd25de0c09d0b09110b640ed9d4b82d42e06e.tar.gz
librepo: update to 1.9.2
expat dependency has been replaced by libxml (From OE-Core rev: 6eeda04126009d5ab216d8178d8cbb0a22318bc5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch21
-rw-r--r--meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch18
-rw-r--r--meta/recipes-devtools/librepo/librepo_1.9.2.bb (renamed from meta/recipes-devtools/librepo/librepo_1.8.1.bb)4
3 files changed, 16 insertions, 27 deletions
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 d69deb5110..b61f0c9324 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,8 +1,7 @@
1From 5b6849d9d7e030c3a521b5245d86f853b0271a61 Mon Sep 17 00:00:00 2001 1From b08a3b71e716dd0485ef51036d32e4c304fb4e67 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:05:36 +0200 3Date: Fri, 30 Dec 2016 18:05:36 +0200
4Subject: [PATCH 1/2] Do not try to obtain PYTHON_INSTALL_DIR by running 4Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python.
5 python.
6 5
7Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
@@ -13,12 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 2 files changed, 12 insertions(+), 12 deletions(-) 12 2 files changed, 12 insertions(+), 12 deletions(-)
14 13
15diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt 14diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt
16index 5ffbd62..90d3c22 100644 15index a0f1f9a..1665079 100644
17--- a/librepo/python/python2/CMakeLists.txt 16--- a/librepo/python/python2/CMakeLists.txt
18+++ b/librepo/python/python2/CMakeLists.txt 17+++ b/librepo/python/python2/CMakeLists.txt
19@@ -1,11 +1,11 @@ 18@@ -1,9 +1,9 @@
20 FIND_PACKAGE (PythonLibs 2 )
21 FIND_PACKAGE (PythonInterp 2 REQUIRED)
22-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " 19-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
23-from sys import stdout 20-from sys import stdout
24-from distutils import sysconfig 21-from distutils import sysconfig
@@ -35,13 +32,10 @@ index 5ffbd62..90d3c22 100644
35 32
36 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") 33 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
37diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt 34diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt
38index 47559f7..b39adc2 100644 35index 52ba44e..da51e10 100644
39--- a/librepo/python/python3/CMakeLists.txt 36--- a/librepo/python/python3/CMakeLists.txt
40+++ b/librepo/python/python3/CMakeLists.txt 37+++ b/librepo/python/python3/CMakeLists.txt
41@@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}") 38@@ -1,9 +1,9 @@
42
43 FIND_PACKAGE(PythonLibs 3.0)
44 FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
45-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " 39-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
46-from sys import stdout 40-from sys import stdout
47-from distutils import sysconfig 41-from distutils import sysconfig
@@ -57,6 +51,3 @@ index 47559f7..b39adc2 100644
57 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) 51 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
58 52
59 MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") 53 MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}")
60--
612.14.1
62
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 f7d7ab3a2a..488657154a 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,29 +1,27 @@
1From a36be8192615e2a1fb5a5856d44565277f15583b Mon Sep 17 00:00:00 2001 1From 9f44d2f4aaf706027fe5a02f6d83547ff343f09c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:23:27 +0200 3Date: Fri, 30 Dec 2016 18:23:27 +0200
4Subject: [PATCH 4/4] Set gpgme variables with pkg-config, not with cmake 4Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
5 module (which doesn't work properly) 5 (which doesn't work properly)
6 6
7Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] 7Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
9--- 10---
10 CMakeLists.txt | 3 ++- 11 CMakeLists.txt | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-) 12 1 file changed, 2 insertions(+), 1 deletion(-)
12 13
13diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
14index ef07d2d..f1fa09b 100644 15index 0f7271f..d71373f 100644
15--- a/CMakeLists.txt 16--- a/CMakeLists.txt
16+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
17@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) 18@@ -30,7 +30,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
18 PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) 19 PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
19 FIND_PACKAGE(EXPAT REQUIRED) 20 PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
20 FIND_PACKAGE(CURL REQUIRED) 21 FIND_PACKAGE(CURL REQUIRED)
21-FIND_PACKAGE(Gpgme REQUIRED) 22-FIND_PACKAGE(Gpgme REQUIRED)
22+PKG_CHECK_MODULES(GPGME gpgme REQUIRED) 23+PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
23+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) 24+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
24 FIND_PACKAGE(Xattr REQUIRED)
25 25
26 INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS}) 26 INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
27-- 27
282.11.0
29
diff --git a/meta/recipes-devtools/librepo/librepo_1.8.1.bb b/meta/recipes-devtools/librepo/librepo_1.9.2.bb
index 456988558b..69c2411f7d 100644
--- a/meta/recipes-devtools/librepo/librepo_1.8.1.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.9.2.bb
@@ -7,11 +7,11 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \
7 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ 7 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
8 " 8 "
9 9
10SRCREV = "7b9b7bf388f3f059529c6f50c40b30919fef30f9" 10SRCREV = "313a7644d03f9657ee0c7aa747d1db260f8e2fc0"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14DEPENDS = "curl expat glib-2.0 openssl attr gpgme" 14DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2"
15 15
16inherit cmake distutils3-base pkgconfig 16inherit cmake distutils3-base pkgconfig
17 17