From owner-svn-ports-all@freebsd.org Wed Aug 22 19:38:09 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8585E1093392; Wed, 22 Aug 2018 19:38:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3B832868F4; Wed, 22 Aug 2018 19:38:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E1C2176D3; Wed, 22 Aug 2018 19:38:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7MJc9sw063855; Wed, 22 Aug 2018 19:38:09 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7MJc8MQ063853; Wed, 22 Aug 2018 19:38:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808221938.w7MJc8MQ063853@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 22 Aug 2018 19:38:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477812 - in head: java/openjfx8-devel/files www/webkit2-gtk3/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: java/openjfx8-devel/files www/webkit2-gtk3/files X-SVN-Commit-Revision: 477812 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2018 19:38:09 -0000 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 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