Skip to contentSkip to conversation

createrepo-c: upgrade 1.0.0 -> 1.0.1

PATCH New [email protected] 1 participant 1 message Oct 13, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 createrepo-c: upgrade 1.0.0 -> 1.0.1

From: Wang Mingyu <[email protected]>

0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch removed since it's included in 1.0.1.

---
 ...s_groupfile-outside-WITH_LIBMODULEMD.patch | 46 -------------------
 ...erepo-c_1.0.0.bb => createrepo-c_1.0.1.bb} |  3 +-
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch
 rename meta/recipes-devtools/createrepo-c/{createrepo-c_1.0.0.bb => createrepo-c_1.0.1.bb} (92%)
meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch deleted +0 -46
deleted file mode 100644
index ea768e06e6..0000000000
@@ -1,46 +0,0 @@
-From 5326969acc0c7e9e3cabca202154e4120c0d2c2f Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 26 Sep 2023 14:52:11 -0700
-Subject: [PATCH] Move cr_compress_groupfile outside WITH_LIBMODULEMD
-
-This function is used in code which is not conditional under WITH_LIBMODULEMD
-therefore the declaration should also match its definition scope
-
-Fixes build issues flagged by clang
-
-src/createrepo_c.c:850:16: error: incompatible integer to pointer conversion initializing 'gchar *' (aka 'char *') with an
- expression of type 'int' [-Wint-conversion]
-|   850 |         gchar *compressed_path = cr_compress_groupfile(cmd_options->groupfile_fullpath, tmp_out_repo, compression);
-|       |                ^                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/387]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/metadata_internal.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/metadata_internal.h b/src/metadata_internal.h
-index 8ba0576..ecfbac2 100644
---- a/src/metadata_internal.h
-+++ b/src/metadata_internal.h
-@@ -52,14 +52,14 @@ cr_metadata_load_modulemd(ModulemdModuleIndex **moduleindex,
-  * @param dest_dir      Path to directory where the compressed groupfile should be stored.
-  * @return              Path to the new compressed groupfile. Has to be freed by the caller.
-  */
-+
-+#endif /* WITH_LIBMODULEMD */
-+
- gchar *
- cr_compress_groupfile(const char *groupfile,
-                       const char *dest_dir,
-                       cr_CompressionType compression);
- 
--
--#endif /* WITH_LIBMODULEMD */
--
- #ifdef __cplusplus
- }
- #endif
--- 
-2.42.0
-
meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb +1 -2
similarity index 92%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb
index f4e65492f8..44d9213bd4 100644
@@ -8,10 +8,9 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            file://0001-include-rpm-rpmstring.h.patch \
            file://time64fix.patch \
-           file://0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch \
            "
 
-SRCREV = "0cc13920991b2fb8f87fb9d352bd3394c2983289"
+SRCREV = "e7af838e04009cd2f848a00e1ea31cc42c8f3ae7"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.34.1