65 lines
2.8 KiB
Diff
65 lines
2.8 KiB
Diff
|
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/public/scoped_res_state.cc
|
||
|
|
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/public/scoped_res_state.cc
|
||
|
|
@@ -13,7 +13,7 @@
|
||
|
|
namespace net {
|
||
|
|
|
||
|
|
ScopedResState::ScopedResState() {
|
||
|
|
-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
|
||
|
|
+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
|
||
|
|
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
|
||
|
|
// res_init behaves the same way.
|
||
|
|
memset(&_res, 0, sizeof(_res));
|
||
|
|
@@ -25,7 +25,7 @@ ScopedResState::ScopedResState() {
|
||
|
|
}
|
||
|
|
|
||
|
|
ScopedResState::~ScopedResState() {
|
||
|
|
-#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
|
||
|
|
+#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
|
||
|
|
|
||
|
|
// Prefer res_ndestroy where available.
|
||
|
|
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
|
||
|
|
@@ -34,7 +34,7 @@ ScopedResState::~ScopedResState() {
|
||
|
|
res_nclose(&res_);
|
||
|
|
#endif // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
|
||
|
|
|
||
|
|
-#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
|
||
|
|
+#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
|
||
|
|
}
|
||
|
|
|
||
|
|
bool ScopedResState::IsValid() const {
|
||
|
|
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
|
||
|
|
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
|
||
|
|
@@ -3158,7 +3158,7 @@ HostResolverManager::HostResolverManager
|
||
|
|
if (system_dns_config_notifier_)
|
||
|
|
system_dns_config_notifier_->AddObserver(this);
|
||
|
|
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
|
||
|
|
- !BUILDFLAG(IS_ANDROID)
|
||
|
|
+ !BUILDFLAG(IS_ANDROID) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
|
||
|
|
EnsureDnsReloaderInit();
|
||
|
|
#endif
|
||
|
|
|
||
|
|
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/dns_reloader.cc
|
||
|
|
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/dns_reloader.cc
|
||
|
|
@@ -7,7 +7,8 @@
|
||
|
|
#include "build/build_config.h"
|
||
|
|
|
||
|
|
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
|
||
|
|
- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
|
||
|
|
+ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && \
|
||
|
|
+ !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
|
||
|
|
|
||
|
|
#include <resolv.h>
|
||
|
|
|
||
|
|
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
|
||
|
|
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
|
||
|
|
@@ -192,7 +192,8 @@ int SystemHostResolverCall(const std::st
|
||
|
|
base::BlockingType::WILL_BLOCK);
|
||
|
|
|
||
|
|
#if BUILDFLAG(IS_POSIX) && \
|
||
|
|
- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID))
|
||
|
|
+ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID) || \
|
||
|
|
+ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)))
|
||
|
|
DnsReloaderMaybeReload();
|
||
|
|
#endif
|
||
|
|
auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network);
|