From f29d569cd33a73da5ad675f43a34ad53c5cc9bc6 Mon Sep 17 00:00:00 2001 From: davidovski Date: Thu, 2 Feb 2023 14:10:02 +0000 Subject: Work --- repo/qt5-qtwebengine/qt-musl-resolve.patch | 61 ------------------------------ 1 file changed, 61 deletions(-) delete mode 100644 repo/qt5-qtwebengine/qt-musl-resolve.patch (limited to 'repo/qt5-qtwebengine/qt-musl-resolve.patch') diff --git a/repo/qt5-qtwebengine/qt-musl-resolve.patch b/repo/qt5-qtwebengine/qt-musl-resolve.patch deleted file mode 100644 index 386062e..0000000 --- a/repo/qt5-qtwebengine/qt-musl-resolve.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/src/3rdparty/chromium/net/dns/dns_reloader.cc -+++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc -@@ -9,6 +9,10 @@ - - #include - -+#if !defined(__GLIBC__) -+#include "resolv_compat.h" -+#endif -+ - #include "base/lazy_instance.h" - #include "base/macros.h" - #include "base/notreached.h" ---- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc -+++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc -@@ -8,6 +8,10 @@ - #include - #include - -+#if !defined(__GLIBC__) -+#include "resolv_compat.h" -+#endif -+ - #include "base/bind.h" - #include "base/files/file.h" - #include "base/files/file_path.h" -diff --git a/src/3rdparty/chromium/net/dns/resolv_compat.h b/src/3rdparty/chromium/net/dns/resolv_compat.h -new file mode 100644 -index 0000000..4f0e852 ---- /dev/null -+++ b/src/3rdparty/chromium/net/dns/resolv_compat.h -@@ -0,0 +1,29 @@ -+#if !defined(__GLIBC__) -+/*************************************************************************** -+ * resolv_compat.h -+ * -+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc -+ * Note: res_init() is actually deprecated according to -+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html -+ **************************************************************************/ -+#include -+ -+static inline int res_ninit(res_state statp) -+{ -+ int rc = res_init(); -+ if (statp != &_res) { -+ memcpy(statp, &_res, sizeof(*statp)); -+ } -+ return rc; -+} -+ -+static inline int res_nclose(res_state statp) -+{ -+ if (!statp) -+ return -1; -+ if (statp != &_res) { -+ memset(statp, 0, sizeof(*statp)); -+ } -+ return 0; -+} -+#endif -- cgit v1.2.1