Date: Mon, 23 Mar 2020 12:43:40 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> 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 Message-ID: <202003231243.02NChe5M037193@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <new> // placement new + #include <limits> ++#ifdef __cpp_impl_three_way_comparison ++#include <compare> ++#endif + + RAPIDJSON_DIAG_PUSH + #ifdef __clang__ +@@ -175,12 +178,17 @@ class GenericMemberIterator { (public) + + //! @name relations + //@{ ++#ifdef __cpp_impl_three_way_comparison ++ template <bool Const_> bool operator==(const GenericMemberIterator<Const_,Encoding,Allocator>& that) const { return ptr_ == that.ptr_; } ++ template <bool Const_> std::strong_ordering operator<=>(const GenericMemberIterator<Const_,Encoding,Allocator>& 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 <typename Callback> + auto with(Callback &&callback) { +- QMutexLocker lock(&_mutex); ++ QMutexLocker lock((QBasicMutex *)&_mutex); + return callback(_value); + } + + template <typename Callback> + auto with(Callback &&callback) const { +- QMutexLocker lock(&_mutex); ++ QMutexLocker lock((QBasicMutex *)&_mutex); + return callback(_value); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003231243.02NChe5M037193>