diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-15 12:54:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-16 11:10:02 +0100 |
commit | 3832e64a66af384d5f53139fce40065ccc0e5227 (patch) | |
tree | 1427eb83b485de55ef11cba6273c4f547d6b3ec9 /meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch | |
parent | fb757997883e7f877ef335f464f789c0fb84c2dc (diff) | |
download | poky-3832e64a66af384d5f53139fce40065ccc0e5227.tar.gz |
webkitgtk: update to 2.24.0
Drop bad_optional_access.patch, as the code it tweaks has
been removed upstream.
Rebase other patches.
Add an option for jpeg2000 support.
(From OE-Core rev: 628e1935431207cbb8ef3e44637f9ad462eea133)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch b/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch deleted file mode 100644 index 9d0d50b79e..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | unbreak build with libc++ 7 | ||
2 | |||
3 | based on | ||
4 | https://svnweb.freebsd.org/ports/head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h?view=markup&pathrev=477812 | ||
5 | |||
6 | Fixes | ||
7 | |||
8 | /usr/include/c++/v1/optional:171:29: error: redefinition of 'bad_optional_access' | ||
9 | class _LIBCPP_EXCEPTION_ABI bad_optional_access | ||
10 | ^ | ||
11 | DerivedSources/ForwardingHeaders/wtf/Optional.h:295:7: note: previous definition is here | ||
12 | class bad_optional_access : public std::logic_error { | ||
13 | ^ | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- a/Source/WTF/wtf/Optional.h | ||
18 | +++ b/Source/WTF/wtf/Optional.h | ||
19 | @@ -276,14 +276,14 @@ struct nullopt_t | ||
20 | }; | ||
21 | constexpr nullopt_t nullopt{nullopt_t::init()}; | ||
22 | |||
23 | - | ||
24 | +# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000 | ||
25 | // 20.5.8, class bad_optional_access | ||
26 | class bad_optional_access : public std::logic_error { | ||
27 | public: | ||
28 | explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {} | ||
29 | explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {} | ||
30 | }; | ||
31 | - | ||
32 | +# endif // _LIBCPP_VERSION < 7000 | ||
33 | |||
34 | template <class T> | ||
35 | union storage_t | ||