svn commit: r477812 - in head: java/openjfx8-devel/files www/webkit2-gtk3/files

[Jan Beich]

Author: jbeich
Date: Wed Aug 22 19:38:08 2018
New Revision: 477812
URL: https://svnweb.freebsd.org/changeset/ports/477812

Log:
  www/webkit2-gtk3, java/openjfx8-devel: unbreak with libc++ 7
  
  In file included from Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp:28:
  In file included from Source/JavaScriptCore/bytecode/ArrayProfile.h:29:
  In file included from Source/JavaScriptCore/runtime/Structure.h:28:
  In file included from Source/JavaScriptCore/runtime/ClassInfo.h:25:
  In file included from Source/JavaScriptCore/interpreter/CallFrame.h:30:
  In file included from Source/JavaScriptCore/runtime/VM.h:40:
  In file included from Source/JavaScriptCore/runtime/FunctionHasExecutedCache.h:28:
  In file included from /usr/include/c++/v1/unordered_map:385:
  In file included from /usr/include/c++/v1/__node_handle:16:
  /usr/include/c++/v1/optional:171:29: error: redefinition of 'bad_optional_access'
  class _LIBCPP_EXCEPTION_ABI bad_optional_access
                              ^
  DerivedSources/ForwardingHeaders/wtf/Optional.h:295:7: note: previous definition is here
  class bad_optional_access : public std::logic_error {
        ^
  
  PR:		230464 230600
  Submitted by:	dim

Added:
  head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h   (contents, props changed)
  head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h   (contents, props changed)

Added: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h	Wed Aug 22 19:38:08 2018	(r477812)
@@ -0,0 +1,17 @@
+--- modules/web/src/main/native/Source/WTF/wtf/Optional.h.orig	2018-03-23 23:53:57 UTC
++++ modules/web/src/main/native/Source/WTF/wtf/Optional.h
+@@ -295,12 +295,14 @@ struct nullopt_t
+ constexpr nullopt_t nullopt{nullopt_t::init()};
+ 
+ 
++# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
+ // 20.5.8, class bad_optional_access
+ class bad_optional_access : public std::logic_error {
+ public:
+   explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
+   explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
+ };
++# endif // _LIBCPP_VERSION < 7000
+ 
+ 
+ template <class T>

Added: head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h	Wed Aug 22 19:38:08 2018	(r477812)
@@ -0,0 +1,17 @@
+--- Source/WTF/wtf/Optional.h.orig	2018-02-19 07:45:30 UTC
++++ Source/WTF/wtf/Optional.h
+@@ -291,12 +291,14 @@ struct nullopt_t
+ constexpr nullopt_t nullopt{nullopt_t::init()};
+ 
+ 
++# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
+ // 20.5.8, class bad_optional_access
+ class bad_optional_access : public std::logic_error {
+ public:
+   explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
+   explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
+ };
++# endif // _LIBCPP_VERSION < 7000
+ 
+ 
+ template <class T>