mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
libdnf: update to 0.28.1
Remove upstreamed 0001-include-missing-string-and-errno.h-headers.patch Rebase the other patches. (From OE-Core rev: b0c76d9b451ba10b97e9ecee7bbfc7158cab4152) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
62d64f4441
commit
8987cf8a11
@@ -1,4 +1,4 @@
|
||||
From 0d0155c4dd6c0b3305ea2ab0e10b0f84d024a6e1 Mon Sep 17 00:00:00 2001
|
||||
From e5a50db749b2b02e9e0cff9f7b639020e8ac76da Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 6 Nov 2018 13:54:43 +0100
|
||||
Subject: [PATCH] Add WITH_TESTS option
|
||||
@@ -14,36 +14,36 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b73a03d7..a9e0200f 100644
|
||||
index ce88b9e3..7a99320a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -36,6 +36,7 @@ OPTION(WITH_MAN "Enables hawkey man page generation" ON)
|
||||
OPTION(WITH_HTML "Enables hawkey HTML generation" ON)
|
||||
@@ -32,6 +32,7 @@ option(WITH_HTML "Enables hawkey HTML generation" ON)
|
||||
option(WITH_MAN "Enables hawkey man page generation" ON)
|
||||
option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF)
|
||||
option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF)
|
||||
+option(WITH_TESTS "Enables unit tests" ON)
|
||||
|
||||
OPTION(WITH_BINDINGS "Enables python/SWIG bindings" ON)
|
||||
+OPTION(WITH_TESTS "Enables unit tests" ON)
|
||||
|
||||
OPTION (ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF)
|
||||
option (ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF)
|
||||
@@ -122,8 +123,10 @@ IF (WITH_BINDINGS)
|
||||
# ADD_SUBDIRECTORY (bindings/perl)
|
||||
ADD_SUBDIRECTORY (bindings/python)
|
||||
ENDIF()
|
||||
# load pkg-config first; it's required by other modules
|
||||
@@ -158,8 +159,10 @@ endif()
|
||||
|
||||
|
||||
# build tests
|
||||
+IF (WITH_TESTS)
|
||||
ENABLE_TESTING()
|
||||
ADD_SUBDIRECTORY (tests)
|
||||
enable_testing()
|
||||
add_subdirectory(tests)
|
||||
+ENDIF()
|
||||
IF (WITH_BINDINGS)
|
||||
ADD_SUBDIRECTORY (python/hawkey)
|
||||
ADD_SUBDIRECTORY (docs/hawkey)
|
||||
if(WITH_BINDINGS)
|
||||
add_subdirectory(python/hawkey)
|
||||
endif()
|
||||
diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt
|
||||
index 3c0b3c0c..31466ed9 100644
|
||||
index d9645346..84d17204 100644
|
||||
--- a/python/hawkey/CMakeLists.txt
|
||||
+++ b/python/hawkey/CMakeLists.txt
|
||||
@@ -49,4 +49,6 @@ TARGET_LINK_LIBRARIES(_hawkeymodule ${PYTHON_LIBRARY})
|
||||
INSTALL(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
|
||||
INSTALL(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
|
||||
@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
|
||||
install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
|
||||
install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
|
||||
|
||||
+IF (WITH_TESTS)
|
||||
ADD_SUBDIRECTORY(tests)
|
||||
add_subdirectory(tests)
|
||||
+ENDIF()
|
||||
|
||||
+8
-8
@@ -1,4 +1,4 @@
|
||||
From c139a6c929cff93dbb9b8279e97263fc9e055727 Mon Sep 17 00:00:00 2001
|
||||
From 9294cd19e5e3121fb8d37b44ee82dd7c4b3ab2c7 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 7 Feb 2017 12:16:03 +0200
|
||||
Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is
|
||||
@@ -13,15 +13,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cd91f08..6422534 100644
|
||||
index b722d4fb..ce88b9e3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -46,7 +46,7 @@ endif(APPLE)
|
||||
PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
|
||||
pkg_check_modules(SMARTCOLS REQUIRED smartcols)
|
||||
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
|
||||
@@ -45,7 +45,7 @@ endif()
|
||||
|
||||
# build dependencies
|
||||
find_package(Gpgme REQUIRED)
|
||||
-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
||||
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
|
||||
set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
||||
if (ENABLE_RHSM_SUPPORT)
|
||||
pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
|
||||
-65
@@ -1,65 +0,0 @@
|
||||
From ccc89ff0c1f8e55a4a22444d051925408f265df1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 30 Jan 2019 10:32:11 -0800
|
||||
Subject: [PATCH] include missing <string> and errno.h headers
|
||||
|
||||
This is unearthed when compiling with clang/libc++
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/677]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
libdnf/conf/ConfigParser.hpp | 1 +
|
||||
libdnf/module/modulemd/ModuleProfile.hpp | 1 +
|
||||
libdnf/sack/changelog.hpp | 1 +
|
||||
libdnf/utils/smartcols/Cell.hpp | 1 +
|
||||
4 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/libdnf/conf/ConfigParser.hpp b/libdnf/conf/ConfigParser.hpp
|
||||
index 97f25500..2a3851fa 100644
|
||||
--- a/libdnf/conf/ConfigParser.hpp
|
||||
+++ b/libdnf/conf/ConfigParser.hpp
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <map>
|
||||
#include <stdexcept>
|
||||
+#include <string>
|
||||
#include <utility>
|
||||
|
||||
namespace libdnf {
|
||||
diff --git a/libdnf/module/modulemd/ModuleProfile.hpp b/libdnf/module/modulemd/ModuleProfile.hpp
|
||||
index ab018deb..8d996ff4 100644
|
||||
--- a/libdnf/module/modulemd/ModuleProfile.hpp
|
||||
+++ b/libdnf/module/modulemd/ModuleProfile.hpp
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
|
||||
#include <memory>
|
||||
+#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <modulemd/modulemd.h>
|
||||
diff --git a/libdnf/sack/changelog.hpp b/libdnf/sack/changelog.hpp
|
||||
index a3d3fc44..d830c414 100644
|
||||
--- a/libdnf/sack/changelog.hpp
|
||||
+++ b/libdnf/sack/changelog.hpp
|
||||
@@ -23,6 +23,7 @@
|
||||
#define __CHANGELOG_HPP
|
||||
|
||||
#include <ctime>
|
||||
+#include <string>
|
||||
|
||||
namespace libdnf {
|
||||
|
||||
diff --git a/libdnf/utils/smartcols/Cell.hpp b/libdnf/utils/smartcols/Cell.hpp
|
||||
index 2e811dee..b90f0050 100644
|
||||
--- a/libdnf/utils/smartcols/Cell.hpp
|
||||
+++ b/libdnf/utils/smartcols/Cell.hpp
|
||||
@@ -22,6 +22,7 @@
|
||||
#define LIBDNF_CELL_HPP
|
||||
|
||||
#include <libsmartcols/libsmartcols.h>
|
||||
+#include <cerrno>
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
|
||||
+10
-10
@@ -1,4 +1,4 @@
|
||||
From 2bcd0b9f6310bacdc554e077e85319a5e90e5ce0 Mon Sep 17 00:00:00 2001
|
||||
From 18c2c06017784cd641cc8a3deee5fc472008f7f4 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:24:50 +0200
|
||||
Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
|
||||
@@ -13,16 +13,16 @@ 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 0b405cb..cd91f08 100644
|
||||
index 16b63308..b722d4fb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -46,7 +46,8 @@ endif(APPLE)
|
||||
PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
|
||||
pkg_check_modules(SMARTCOLS REQUIRED smartcols)
|
||||
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
|
||||
-find_package (LibSolv 0.6.30 REQUIRED COMPONENTS ext)
|
||||
@@ -45,7 +45,8 @@ endif()
|
||||
|
||||
# build dependencies
|
||||
find_package(Gpgme REQUIRED)
|
||||
-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext)
|
||||
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
||||
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
||||
if (ENABLE_RHSM_SUPPORT)
|
||||
pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3)
|
||||
include_directories (${RHSM_INCLUDE_DIRS})
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
|
||||
|
||||
+1
-2
@@ -7,10 +7,9 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
|
||||
file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
|
||||
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
|
||||
file://0001-Add-WITH_TESTS-option.patch \
|
||||
file://0001-include-missing-string-and-errno.h-headers.patch \
|
||||
"
|
||||
|
||||
SRCREV = "bd23204aa83d10e3d293a9f2d496cba6070f6a4d"
|
||||
SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user