From owner-svn-ports-head@freebsd.org Fri Aug 24 09:34:30 2018 Return-Path: Delivered-To: svn-ports-head@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 DC2751084ED9; Fri, 24 Aug 2018 09:34:29 +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 8FE3E7F572; Fri, 24 Aug 2018 09:34:29 +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 70F8D7599; Fri, 24 Aug 2018 09:34:29 +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 w7O9YTQs046708; Fri, 24 Aug 2018 09:34:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7O9YTng046707; Fri, 24 Aug 2018 09:34:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808240934.w7O9YTng046707@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 24 Aug 2018 09:34:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477951 - head/games/nxengine/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/nxengine/files X-SVN-Commit-Revision: 477951 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2018 09:34:30 -0000 Author: jbeich Date: Fri Aug 24 09:34:29 2018 New Revision: 477951 URL: https://svnweb.freebsd.org/changeset/ports/477951 Log: games/nxengine: unbreak with libc++ 7 In file included from src/i18n/translate.cpp:2: src/i18n/../common/json.hpp:1379:9: error: static_assert failed "could not find from_json() method in T's namespace" static_assert(sizeof(BasicJsonType) == 0, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ src/i18n/../common/json.hpp:1388:16: note: in instantiation of function template specialization 'nlohmann::detail::from_json_fn::call, bool, long, unsigned long, double, std::allocator, adl_serializer>, std::__1::basic_string_view > >' requested here return call(j, val, priority_tag<1> {}); ^ src/i18n/../common/json.hpp:6860:9: note: in instantiation of function template specialization 'nlohmann::detail::from_json_fn::operator(), bool, long, unsigned long, double, std::allocator, adl_serializer>, std::__1::basic_string_view > >' requested here ::nlohmann::from_json(std::forward(j), val); ^ src/i18n/../common/json.hpp:9579:36: note: in instantiation of function template specialization 'nlohmann::adl_serializer >, void>::from_json, bool, long, unsigned long, double, std::allocator, adl_serializer> &, std::__1::basic_string_view > >' requested here JSONSerializer::from_json(*this, ret); ^ src/i18n/../common/json.hpp:9842:16: note: in instantiation of function template specialization 'nlohmann::basic_json, bool, long, unsigned long, double, std::allocator, adl_serializer>::get >, std::__1::basic_string_view >, 0>' requested here return get(); ^ /usr/include/c++/v1/string:875:29: note: in instantiation of function template specialization 'nlohmann::basic_json, bool, long, unsigned long, double, std::allocator, adl_serializer>::operator basic_string_view >, 0>' requested here {__self_view __sv = __t; return assign(__sv);} ^ src/i18n/translate.cpp:22:34: note: in instantiation of function template specialization 'std::__1::basic_string, std::__1::allocator >::operator=, bool, long, unsigned long, double, std::allocator, adl_serializer>, void>' requested here _strings[ it.key() ] = it.value(); ^ PR: 230630 Obtained from: upstream (json-3.2.0) Approved by: portmgr blanket Added: head/games/nxengine/files/patch-libc++7 (contents, props changed) Added: head/games/nxengine/files/patch-libc++7 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nxengine/files/patch-libc++7 Fri Aug 24 09:34:29 2018 (r477951) @@ -0,0 +1,63 @@ +https://github.com/nlohmann/json/commit/8165707990e4 + +--- src/common/json.hpp.orig 2018-04-09 20:44:59 UTC ++++ src/common/json.hpp +@@ -840,6 +840,16 @@ struct is_compatible_object_type_impl::value; + }; + ++template ++struct is_compatible_string_type_impl : std::false_type {}; ++ ++template ++struct is_compatible_string_type_impl ++{ ++ static constexpr auto value = ++ std::is_same::value; ++}; ++ + template + struct is_compatible_object_type + { +@@ -850,6 +860,15 @@ struct is_compatible_object_type + typename BasicJsonType::object_t, CompatibleObjectType >::value; + }; + ++template ++struct is_compatible_string_type ++{ ++ static auto constexpr value = is_compatible_string_type_impl < ++ conjunction>, ++ has_value_type>::value, ++ typename BasicJsonType::string_t, CompatibleStringType >::value; ++}; ++ + template + struct is_basic_json_nested_type + { +@@ -1132,6 +1151,25 @@ void from_json(const BasicJsonType& j, typename BasicJ + { + JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()))); + } ++ s = *j.template get_ptr(); ++} ++ ++template < ++ typename BasicJsonType, typename CompatibleStringType, ++ enable_if_t < ++ is_compatible_string_type::value and ++ not std::is_same::value and ++ std::is_constructible < ++ BasicJsonType, typename CompatibleStringType::value_type >::value, ++ int > = 0 > ++void from_json(const BasicJsonType& j, CompatibleStringType& s) ++{ ++ if (JSON_UNLIKELY(not j.is_string())) ++ { ++ JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()))); ++ } ++ + s = *j.template get_ptr(); + } +