libsolv: upgrade 0.7.35-> 0.7.36

1.Changelog
  Version 0.7.36
  - selected bug fixes:
    * respect the "default" attribute in environment optionlist in
      the comps parser
    * support suse namespace deps in boolean dependencies
  - new features:
    * support for the Elbrus2000 (e2k) architecture
    * support language() suse namespace rewriting

2.Remove 0001-utils-Conside-musl-when-wrapping-qsort_r.patch
  as the issue was fixed upstream with this commit:
  https://github.com/openSUSE/libsolv/commit/2d0718a4f2001c857d9af24398c68d676a98a3ca

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch
deleted file mode 100644 (file)
index d6e983d..0000000
--- a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From da99bf09e83469612e2c821696025a4e591bb95c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 28 Oct 2021 22:28:45 -0700
-Subject: [PATCH] utils: Conside musl when wrapping qsort_r
-
-musl now has implemented qsort_r, the signature however matches glibc
-and not BSD, current check makes it such that it falls into BSD case
-when building for musl, which clearly is wrong, therefore instead of
-just checking for glibc check for linux to decide which qsort_r
-signature to use. This covers both glibc and musl
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util.c b/src/util.c
-index 72426e09..8f29bc5a 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -159,7 +159,7 @@ solv_setcloexec(int fd, int state)
- 
-    see also: http://sources.redhat.com/ml/libc-alpha/2008-12/msg00003.html
-  */
--#if (defined(__GLIBC__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R))
-+#if (defined(__linux__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R))
- 
- void
- solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard)

diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.35.bb b/meta/recipes-extended/libsolv/libsolv_0.7.36.bb
similarity index 92%
rename from meta/recipes-extended/libsolv/libsolv_0.7.35.bb
rename to meta/recipes-extended/libsolv/libsolv_0.7.36.bb
index ef348de9047ed9eab411bb82352b058ac7001430..f22230599b148527fc9e568e1a70abf28060c1fa 100644 (file)
--- a/meta/recipes-extended/libsolv/libsolv_0.7.35.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.7.36.bb
@@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 DEPENDS = "expat zlib zstd"
 
 SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https;tag=${PV} \
-           file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \
            file://run-ptest \
 "
 
-SRCREV = "fb4b4340d46108cb365113e432642d6024886c7a"
+SRCREV = "1e377699be108ec82bb798ec9c223d45d84a733c"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"