Date: Thu, 25 Nov 2021 19:03:01 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c88ab801382c - main - net-im/tg_owt: Fix installed include to work with clang13 Message-ID: <202111251903.1APJ312Q054501@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=c88ab801382cef0e6d65740a390cc9bbdac99eae commit c88ab801382cef0e6d65740a390cc9bbdac99eae Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-11-25 18:55:29 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2021-11-25 18:59:35 +0000 net-im/tg_owt: Fix installed include to work with clang13 Import code from upstream fixing an issue in an installed include file causing telegram-desktop [1] to fail to build on recent head after the import of clang13. PR: 260042, 260040 [1] Approved by: build fix blanket Obtained from: https://github.com/abseil/abseil-cpp/commit/e19260fd7dbef881492fd73891e0be5bd4a09b95 --- net-im/tg_owt/Makefile | 2 +- ...hird__party_abseil-cpp_absl_meta_type__traits.h | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/net-im/tg_owt/Makefile b/net-im/tg_owt/Makefile index 2db259476edd..fb1bc2e21067 100644 --- a/net-im/tg_owt/Makefile +++ b/net-im/tg_owt/Makefile @@ -2,7 +2,7 @@ PORTNAME= tg_owt PORTVERSION= 0.0.20211021 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MAINTAINER= glebius@FreeBSD.org diff --git a/net-im/tg_owt/files/patch-src_third__party_abseil-cpp_absl_meta_type__traits.h b/net-im/tg_owt/files/patch-src_third__party_abseil-cpp_absl_meta_type__traits.h new file mode 100644 index 000000000000..eeb40597b6c8 --- /dev/null +++ b/net-im/tg_owt/files/patch-src_third__party_abseil-cpp_absl_meta_type__traits.h @@ -0,0 +1,30 @@ +--- src/third_party/abseil-cpp/absl/meta/type_traits.h.orig 2021-10-21 06:15:41 UTC ++++ src/third_party/abseil-cpp/absl/meta/type_traits.h +@@ -616,19 +616,14 @@ using common_type_t = typename std::common_type<T...>: + template <typename T> + using underlying_type_t = typename std::underlying_type<T>::type; + +-#if _MSVC_LANG > 201703L +-template <typename T> +-struct result_of_helper; +-template <typename F, typename ...Args> +-struct result_of_helper<F(Args...)> { +- using type = std::invoke_result_t<F, Args...>; +-}; +-template <typename T> +-using result_of_t = typename result_of_helper<T>::type; +-#else // C++20 +-template <typename T> +-using result_of_t = typename std::result_of<T>::type; +-#endif // C++20 ++#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) ++// std::result_of is deprecated (C++17) or removed (C++20) ++template<typename> struct result_of; ++template<typename F, typename... Args> ++struct result_of<F(Args...)> : std::invoke_result<F, Args...> {}; ++#else ++template<typename F> using result_of = std::result_of<F>; ++#endif + + namespace type_traits_internal { + // In MSVC we can't probe std::hash or stdext::hash because it triggers a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111251903.1APJ312Q054501>