From owner-svn-ports-all@freebsd.org Mon Mar 23 12:43:40 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F4262624F1; Mon, 23 Mar 2020 12:43:40 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mDZh2rqrz4dH5; Mon, 23 Mar 2020 12:43:40 +0000 (UTC) (envelope-from madpilot@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 5D099EA2E; Mon, 23 Mar 2020 12:43:40 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NCheF1037195; Mon, 23 Mar 2020 12:43:40 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NChe5M037193; Mon, 23 Mar 2020 12:43:40 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202003231243.02NChe5M037193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 23 Mar 2020 12:43:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528972 - head/net-im/telegram-desktop/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/net-im/telegram-desktop/files X-SVN-Commit-Revision: 528972 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.29 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: Mon, 23 Mar 2020 12:43:40 -0000 Author: madpilot Date: Mon Mar 23 12:43:39 2020 New Revision: 528972 URL: https://svnweb.freebsd.org/changeset/ports/528972 Log: Fix build with clang 10 PR: 245004 Obtained from: https://github.com/Tencent/rapidjson/commit/2661a17c7eaede8c881e7455f5a66fd593ed8633#diff-4a56fc9353bac10cf2f51e22e38e3b2a (part) Approved by: portmgr (blanket) Added: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h (contents, props changed) Added: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h Mon Mar 23 12:43:39 2020 (r528972) @@ -0,0 +1,30 @@ +--- Telegram/ThirdParty/rlottie/src/lottie/rapidjson/document.h.orig 2020-01-23 12:47:53 UTC ++++ Telegram/ThirdParty/rlottie/src/lottie/rapidjson/document.h +@@ -24,6 +24,9 @@ + #include "encodedstream.h" + #include // placement new + #include ++#ifdef __cpp_impl_three_way_comparison ++#include ++#endif + + RAPIDJSON_DIAG_PUSH + #ifdef __clang__ +@@ -175,12 +178,17 @@ class GenericMemberIterator { (public) + + //! @name relations + //@{ ++#ifdef __cpp_impl_three_way_comparison ++ template bool operator==(const GenericMemberIterator& that) const { return ptr_ == that.ptr_; } ++ template std::strong_ordering operator<=>(const GenericMemberIterator& that) const { return ptr_ <=> that.ptr_; } ++#else + bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; } + bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; } + bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; } + bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; } + bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; } + bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; } ++#endif + //@} + + //! @name dereference Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h Mon Mar 23 12:43:39 2020 (r528972) @@ -0,0 +1,18 @@ +--- Telegram/lib_base/base/thread_safe_wrap.h.orig 2020-01-29 09:41:30 UTC ++++ Telegram/lib_base/base/thread_safe_wrap.h +@@ -19,13 +19,13 @@ class thread_safe_wrap { (public) + + template + auto with(Callback &&callback) { +- QMutexLocker lock(&_mutex); ++ QMutexLocker lock((QBasicMutex *)&_mutex); + return callback(_value); + } + + template + auto with(Callback &&callback) const { +- QMutexLocker lock(&_mutex); ++ QMutexLocker lock((QBasicMutex *)&_mutex); + return callback(_value); + } +