From owner-svn-ports-head@freebsd.org Tue Aug 14 21:29:43 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 754A31065127; Tue, 14 Aug 2018 21:29:43 +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 2421D89D58; Tue, 14 Aug 2018 21:29:43 +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 0389A21100; Tue, 14 Aug 2018 21:29:43 +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 w7ELTgMn042578; Tue, 14 Aug 2018 21:29:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7ELTghH042577; Tue, 14 Aug 2018 21:29:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808142129.w7ELTghH042577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 14 Aug 2018 21:29:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477204 - head/www/newsboat/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/www/newsboat/files X-SVN-Commit-Revision: 477204 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: Tue, 14 Aug 2018 21:29:43 -0000 Author: jbeich Date: Tue Aug 14 21:29:42 2018 New Revision: 477204 URL: https://svnweb.freebsd.org/changeset/ports/477204 Log: www/newsboat: unbreak with libc++ 7 In file included from src/ttrss_api.cpp:1: In file included from include/ttrss_api.h:4: ./3rd-party/json.hpp:1201:9: error: static_assert failed "could not find from_json() method in T's namespace" static_assert(sizeof(BasicJsonType) == 0, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ ./3rd-party/json.hpp:1216: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> {}); ^ ./3rd-party/json.hpp:9660: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); ^ ./3rd-party/json.hpp:12181: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); ^ ./3rd-party/json.hpp:12443: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/ttrss_api.cpp:69:7: 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 sid = content["session_id"]; ^ PR: 230631 Reported by: antoine (via exp-run) Obtained from: upstream (json) Approved by: portmgr blanket Added: head/www/newsboat/files/patch-json-libc++7 (contents, props changed) Added: head/www/newsboat/files/patch-json-libc++7 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/newsboat/files/patch-json-libc++7 Tue Aug 14 21:29:42 2018 (r477204) @@ -0,0 +1,63 @@ +https://github.com/nlohmann/json/commit/8165707990e4 + +--- 3rd-party/json.hpp.orig 2018-06-24 19:26:15 UTC ++++ 3rd-party/json.hpp +@@ -353,6 +353,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 + { +@@ -363,6 +373,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 + { +@@ -974,6 +993,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(); + } +