From nobody Wed May 22 19:51:20 2024 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 4Vl2490f41z5Kbqq; Wed, 22 May 2024 19:51:21 +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 4Vl24872k9z42ds; Wed, 22 May 2024 19:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716407481; 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=BNM5dfw/qe2PS6nxX0PYRI+AHmcTKbDVDejd2mIbkK8=; b=H+OQHfKJaymKuAaoG4cNu8YdN7G2h6MHTptaM74DmZCNvSHp0cmXfZ/Udc4Cox5EysPDUG ODEM57beGpkzQUPYmr+AjvjKmJuwDO2TWmPlRFlg5jd+rWa03hjjiZEeyhli2HkqeHAwhU J7siWJZWkFIzurXnw/9brUFTRagVfss6eML4BZ4HFEJXzhBX6VpIb9xx52LsewSE5SBDjL p9pwpfmbKHP6QuqXLfbgIf/x71bs1Oxheq9tPYeH6LqSJTp6XBUrRjxf2os/uXVUFpaByC w5hI+vkl3kRR9v2QqlUCpxwq3EfaN5UV/Hbe0Q0IQfWzgEmOxMwORrdwOtuYtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716407481; a=rsa-sha256; cv=none; b=pM9hAcVv23vwBvU3AF6nJwcwnReMCeE7rne7399IkZpUwg6yDroaSH2h3GYwjoWXUPSOkR yR3UM27j03HQVS4icgA+lNf6ZuhrXufudmHvFfFJ5ntIsJc9pd7FNKNcuGgo+tPUm5NImF bPA6XKTPcoYsCcuwEc6PwVy3sV6MgN9y4SR9b7rfMhg18sDR1uluh6VsBgz21YuQfOL0Ow +Q25u0+4R8VAEsLh/4PeOI7rJR5pshwUcHiX0Ksi4B3jhTe8Q44kfrpa6diL368wJQGA8q Dsxp/dD4Rl9nCxBuqaUixZdgZ9mXGuPUJ/Brae+UZkJ8Jc2GFAoFA06ERWtBNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716407481; 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=BNM5dfw/qe2PS6nxX0PYRI+AHmcTKbDVDejd2mIbkK8=; b=TMApx+813QZeETq1WwTW0wxgn7zrsXySB2wzqOeFjbJAeNXOOroPpAmrA/iq3BMnjQybjm OabXTn7iKjczPA6VwwHsrXxiHw3GR07yveXTLsid1LKFEiN15s+S+qzWXoRCKaJ3ll0Wwy X6ZJUzxLHwPAOr1OlHwUIcKfTwR9TV+nu/3aiPc8v9kF6s5ndvcU96nYttCsnv7VzZQphX JQAAQnoAevzh5EZjBYl+fZsg2PM64QThrsZPJh9c61WBThMg1Bqwc8TCZyJgdpg4jmFXLr 4zknhVBm8x5VVrGOqo02yrw8OS2LfATGnSKaFHksnqaBB/eJlJqkIAoJrPJEBQ== 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 4Vl2486fZkzJVp; Wed, 22 May 2024 19:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44MJpKEg057241; Wed, 22 May 2024 19:51:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MJpKQu057238; Wed, 22 May 2024 19:51:20 GMT (envelope-from git) Date: Wed, 22 May 2024 19:51:20 GMT Message-Id: <202405221951.44MJpKQu057238@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Certner Subject: git: 97eecf838ae8 - main - security/kleopatra: Fix build against libc++18 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97eecf838ae8e88c56c7f97080adce0dc593a491 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=97eecf838ae8e88c56c7f97080adce0dc593a491 commit 97eecf838ae8e88c56c7f97080adce0dc593a491 Author: Olivier Certner AuthorDate: 2024-05-22 19:08:41 +0000 Commit: Olivier Certner CommitDate: 2024-05-22 19:51:01 +0000 security/kleopatra: Fix build against libc++18 libc++ 18 by default removes unique() in 'std::shared_ptr' (in ), as a follow-up to this resolution: https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0521r0.html An alternative would be to get it back by defining _LIBCPP_ENABLE_CXX20_REMOVED_SHARED_PTR_UNIQUE before including the libc++ headers, but trying to fight the standard may not be a wise move going forward, especially if/as other C++ libraries follow suit. Upstream MR (approved) is at https://invent.kde.org/pim/kleopatra/-/merge_requests/205. PR: 279139 Approved by: kde (maintainer) Approved by: jrm (ports) Approved by: markj (mentor) --- security/kleopatra/files/patch-src_crypto_recipient.cpp | 14 ++++++++++++++ security/kleopatra/files/patch-src_crypto_sender.cpp | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/security/kleopatra/files/patch-src_crypto_recipient.cpp b/security/kleopatra/files/patch-src_crypto_recipient.cpp new file mode 100644 index 000000000000..7e5efab0e453 --- /dev/null +++ b/security/kleopatra/files/patch-src_crypto_recipient.cpp @@ -0,0 +1,14 @@ +Submitted upstream: https://invent.kde.org/pim/kleopatra/-/merge_requests/205. +To remove when updating to next release. + +--- src/crypto/recipient.cpp.orig 2024-02-11 04:00:57 UTC ++++ src/crypto/recipient.cpp +@@ -85,7 +85,7 @@ void Recipient::detach() + + void Recipient::detach() + { +- if (d && !d.unique()) { ++ if (d && d.use_count() != 1) { + d.reset(new Private(*d)); + } + } diff --git a/security/kleopatra/files/patch-src_crypto_sender.cpp b/security/kleopatra/files/patch-src_crypto_sender.cpp new file mode 100644 index 000000000000..b60c856ac95e --- /dev/null +++ b/security/kleopatra/files/patch-src_crypto_sender.cpp @@ -0,0 +1,14 @@ +Submitted upstream: https://invent.kde.org/pim/kleopatra/-/merge_requests/205. +To remove when updating to next release. + +--- src/crypto/sender.cpp.orig 2024-02-11 04:00:57 UTC ++++ src/crypto/sender.cpp +@@ -91,7 +91,7 @@ void Sender::detach() + + void Sender::detach() + { +- if (d && !d.unique()) { ++ if (d && d.use_count() != 1) { + d.reset(new Private(*d)); + } + }