udisks2: Updare to latest master beyond 2.8.4

Drop the feature.h patch since its fixed differently upstream [1]

[1] 7c9bb088ed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2019-12-31 19:12:02 -08:00
parent ef16acb2bf
commit ded3a74af9
2 changed files with 2 additions and 29 deletions

View File

@ -1,26 +0,0 @@
musl does not define __GNUC_PREREQ therefore check for C library being glibc
if not then define the macro
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: udisks-2.1.7/udisks/udisksclient.c
===================================================================
--- udisks-2.1.7.orig/udisks/udisksclient.c
+++ udisks-2.1.7/udisks/udisksclient.c
@@ -27,8 +27,15 @@
#include "udisksobjectinfo.h"
/* For __GNUC_PREREQ usage below */
-#ifdef __GNUC__
+#ifdef __GLIBC__
# include <features.h>
+#else
+#if defined(__GNUC__)
+#define __GNUC_PREREQ(__maj, __min) \
+ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min))
+#else
+#define __GNUC_PREREQ(__maj, __min) 0
+#endif
#endif
/**

View File

@ -18,10 +18,9 @@ RDEPENDS_${PN} = "acl"
SRC_URI = " \
git://github.com/storaged-project/udisks.git;branch=master \
file://non-gnu-libc.patch \
"
PV = "2.8.4"
SRCREV = "f333e13de8d32f2b82237ccd180c3458d71e78b8"
PV = "2.8.4+git${SRCREV}"
SRCREV = "db5f487345da2eaa87976450ea51c2c465d9b82e"
S = "${WORKDIR}/git"
CVE_PRODUCT = "udisks"