[PATCH 25/34] libdnf: upgrade 0.73.2 -> 0.73.3

Alexander Kanavin
2024-08-27T05:24:19Z

...FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch | 2 +-
...Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | 4 ++--
.../libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch | 2 +-
...Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 4 ++--
meta/recipes-devtools/libdnf/libdnf/armarch.patch | 2 +-
.../libdnf/libdnf/enable_test_data_dir_set.patch | 4 ++--
.../libdnf/{libdnf_0.73.2.bb => libdnf_0.73.3.bb} | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.73.2.bb => libdnf_0.73.3.bb} (97%)

diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
index 046e09eab21..52e74263719 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
@@ -1,4 +1,4 @@
-From 5d6db56791d326e6b486dca54fe2335af0225229 Mon Sep 17 00:00:00 2001
+From 09ff4670e0717ea1a79430c14e108f93fb6f5f34 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 24 Nov 2016 14:33:07 +0200
Subject: [PATCH] FindGtkDoc.cmake: drop the requirement for
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
index 223c1be2188..3f70b855c82 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
@@ -1,4 +1,4 @@
-From bf9bde4af952b67cc357d25b9863889099ea9665 Mon Sep 17 00:00:00 2001
+From 15de1b4266b85ffdf17fad374a43e0ed315b9f22 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
@@ -12,7 +12,7 @@ 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 e99b28d0..548a9137 100644
+index a6f14318..60c66e94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ endif()
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
index 27f76077d74..5d77bcb41a1 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
@@ -1,4 +1,4 @@
-From a6b3bc4fb3db996cd6c5616a99c16d085704dae0 Mon Sep 17 00:00:00 2001
+From 2a4a5f2da7d1b578619a8d0886f6db00bacefdc2 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 1 Jun 2021 10:23:59 +0800
Subject: [PATCH] drop FindPythonInstDir.cmake
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
index ecab47e5afa..25d61095252 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
@@ -1,4 +1,4 @@
-From e40def862bdeb10da295b15c5904fe2829d391c7 Mon Sep 17 00:00:00 2001
+From 9fb0e6130ef5d9fa68240c279d235eee8658c0fa 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
@@ -12,7 +12,7 @@ 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 6444c374..e99b28d0 100644
+index c6bd46a6..a6f14318 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,8 @@ endif()
diff --git a/meta/recipes-devtools/libdnf/libdnf/armarch.patch b/meta/recipes-devtools/libdnf/libdnf/armarch.patch
index 63debdb58f5..54df0aab99d 100644
--- a/meta/recipes-devtools/libdnf/libdnf/armarch.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/armarch.patch
@@ -1,4 +1,4 @@
-From aa0f8b65feec64420a9b7b61cfcc8bcce161e14b Mon Sep 17 00:00:00 2001
+From 8159808516543237fb110d0883e702385a1a866c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 9 Nov 2023 10:29:31 +0000
Subject: [PATCH] libdnf: Fix arm arch mapping issues for qemuarmv5
diff --git a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch
index e4f6d447f17..986b71c4e6a 100644
--- a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch
@@ -1,4 +1,4 @@
-From 25229773a9d4472235278bb45f75439e56630cee Mon Sep 17 00:00:00 2001
+From 3d77c2ff41b1a65d0f4852ed21d7a8ec41b368a8 Mon Sep 17 00:00:00 2001
From: Joe Slater <joe.slater@windriver.com>
Date: Wed, 22 Jul 2020 13:31:11 -0700
Subject: [PATCH] libdnf: allow reproducible binary builds
@@ -14,7 +14,7 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 548a9137..c378e7d9 100644
+index 60c66e94..1459dfbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,7 +132,12 @@ add_definitions(-DGETTEXT_DOMAIN=\\"libdnf\\")
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.73.2.bb b/meta/recipes-devtools/libdnf/libdnf_0.73.3.bb
similarity index 97%
rename from meta/recipes-devtools/libdnf/libdnf_0.73.2.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.73.3.bb
index ed433d4a9fb..e4a34f8ff6a 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.73.2.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.73.3.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
file://armarch.patch \
"

-SRCREV = "86bbb159732e43dd6dff98c96e99382843f7c63b"
+SRCREV = "fbd34472e5edea0a3ed88ae14a47666e23538e4a"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"

S = "${WORKDIR}/git"
--
2.39.2