aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-12-18 20:37:21 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-12-20 00:57:00 +0000
commit5b35f89219e5b4a2bc0792d429c93b0bbc9c6898 (patch)
tree5839082571c4ec1bb824e526c4cfc3ac9f39d10f /recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
parent808d65c129d283850fa6c1e887dd01f8ee86b64b (diff)
qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
* in preparation for rebase on 5.12 #136 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index 63fd9bf3..8582607c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
-From ff6be9a301b7d831c95fe7b10c34783433abd6df Mon Sep 17 00:00:00 2001
+From 7638d64991e35b688aa9e1385925bc45f8589246 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:27:50 -0700
Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
create mode 100644 chromium/net/dns/resolv_compat.h
diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc
-index f2e66331e3..6fe84dd66a 100644
+index f2e66331e33..6fe84dd66af 100644
--- a/chromium/net/dns/dns_config_service_posix.cc
+++ b/chromium/net/dns/dns_config_service_posix.cc
@@ -27,6 +27,10 @@
@@ -28,7 +28,7 @@ index f2e66331e3..6fe84dd66a 100644
#include "net/dns/dns_config_watcher_mac.h"
#endif
diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc
-index 322c8a5f0f..72ff40dbe1 100644
+index 322c8a5f0f7..72ff40dbe15 100644
--- a/chromium/net/dns/dns_reloader.cc
+++ b/chromium/net/dns/dns_reloader.cc
@@ -9,6 +9,10 @@
@@ -44,7 +44,7 @@ index 322c8a5f0f..72ff40dbe1 100644
#include "base/macros.h"
diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h
new file mode 100644
-index 0000000000..4f0e852a19
+index 00000000000..4f0e852a19d
--- /dev/null
+++ b/chromium/net/dns/resolv_compat.h
@@ -0,0 +1,29 @@