diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch')
-rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch deleted file mode 100644 index 78fd4dc79..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 20 May 2018 14:28:27 -0700 -Subject: [PATCH] soup: Forward declare URL class - -This helps getting away with compiler errors seen with clang - -/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: -error: unknown type name 'URL' - static std::optional<ResourceError> checkTLSErrors(const URL&, -GTlsCertificate*, GTlsCertificateFlags); - ^ -Upstream-Status: Backport [https://trac.webkit.org/changeset/231876/webkit] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h -index 03bd72ba..7ca8792d 100644 ---- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h -+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h -@@ -43,6 +43,7 @@ namespace WebCore { - - class CertificateInfo; - class ResourceError; -+class URL; - struct SoupNetworkProxySettings; - - class SoupNetworkSession { |