From nobody Thu Nov 25 19:03:01 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A432818ADA99; Thu, 25 Nov 2021 19:03:01 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J0S1x2f47z4l0R; Thu, 25 Nov 2021 19:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3ADFF22D86; Thu, 25 Nov 2021 19:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1APJ312O054502; Thu, 25 Nov 2021 19:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APJ312Q054501; Thu, 25 Nov 2021 19:03:01 GMT (envelope-from git) Date: Thu, 25 Nov 2021 19:03:01 GMT Message-Id: <202111251903.1APJ312Q054501@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: c88ab801382c - main - net-im/tg_owt: Fix installed include to work with clang13 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c88ab801382cef0e6d65740a390cc9bbdac99eae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637866981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liCspk3nnFsUkWbVDLKFmrkN4yXS215svwbBe6HL2Ik=; b=S31WmwULkWcAnnAZNfLM2hy6s7VTBbeXxKH994JUR6VJJiglQeMVnaLItgSPRZHn5QLWAN pKItQzdSEzDPy223UcsCyrfR81w3CC+vXVgtfbfwhLTWSvDHKPdCPgda3OOtD7WMpLkypw JSA5bPUrC2dpRBnu+W4DUiCChymXJ8I5nxDGLv0T9peK9cG2E21Hf/gYxtPsSwabbBHhdN 815qFmYgQYow07+R2KZnSakQIqikgqQCUOYczw5XZj7yBrDjvMWd1cTnGMVtVqthndxJTe Pj1duI/4cUlXgo3MnzuykOwhTN+33jF4wfGQSqklXGNCS4RIXPKPsAmjzCvQhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637866981; a=rsa-sha256; cv=none; b=iR1cfXyVEMZyGqhRYXDhEZcDR06CY1d6zTXK3joVDqCP5qc7n7NaIHojHacqpdol3FiRFD D2ueGVpMeHl6D9uOErSt2hMuZd1us0OivBk65gYj5mzi8pkPWBf0LKBwvW3S14/IKWlCW2 fywLz6hNPDRI5TSiKBTZQ50PCLhkPjVr5K17nnuP+oiJMiPBep0pVXZGdVtYb5IhXOQoum n8I5sE4UonsjU6V/dGDnJfFbGg87vxWejCjhoY/54bMzDCKhd26afVxJ5xaJccVkbLjB2N wamJ0NW8UebXhsCViXqit/pSk8MGnTi3V19anBFEha7bXTRnxwEKlXg89g07/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=c88ab801382cef0e6d65740a390cc9bbdac99eae commit c88ab801382cef0e6d65740a390cc9bbdac99eae Author: Guido Falsi AuthorDate: 2021-11-25 18:55:29 +0000 Commit: Guido Falsi 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: + template + using underlying_type_t = typename std::underlying_type::type; + +-#if _MSVC_LANG > 201703L +-template +-struct result_of_helper; +-template +-struct result_of_helper { +- using type = std::invoke_result_t; +-}; +-template +-using result_of_t = typename result_of_helper::type; +-#else // C++20 +-template +-using result_of_t = typename std::result_of::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 struct result_of; ++template ++struct result_of : std::invoke_result {}; ++#else ++template using result_of = std::result_of; ++#endif + + namespace type_traits_internal { + // In MSVC we can't probe std::hash or stdext::hash because it triggers a