Attachment 250798 Details for Bug 279139 – Patch fixing the build against libc++ 18

[patch] Patch fixing the build against libc++ 18

0001-security-kleopatra-Fix-build-against-libc-18.patch (text/plain), 1.38 KB, created by Olivier Certner on 2024-05-18 20:18:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Certner

Created: 2024-05-18 20:18:08 UTC

Size: 1.38 KB

patch

obsolete

>From 9c8f881b654bb887d5b9009faf53d5b67060b6de Mon Sep 17 00:00:00 2001
>From: Olivier Certner <olce@FreeBSD.org>
>Date: Sat, 18 May 2024 22:11:12 +0200
>Subject: [PATCH] security/kleopatra: Fix build against libc++ 18
>
>Kleopatra uses unique() on std::shared_ptr, which is deprecated and is by
>default not exposed by libc++ 18. Fortunately, the latter defines a new macro,
>_LIBCPP_ENABLE_CXX20_REMOVED_SHARED_PTR_UNIQUE, allowing to recover that member
>function.
>
>Source code modification submitted upstream at:
>https://invent.kde.org/pim/kleopatra/-/merge_requests/205
>---
> security/kleopatra/Makefile | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/security/kleopatra/Makefile b/security/kleopatra/Makefile
>index 4ebb05d88f27..a598470b451b 100644
>--- a/security/kleopatra/Makefile
>+++ b/security/kleopatra/Makefile
>@@ -28,8 +28,16 @@ OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
>+.if ${COMPILER_TYPE} == clang
>+.if ${COMPILER_VERSION} >= 160
> CXXFLAGS+=	-Wno-error=enum-constexpr-conversion
> .endif
>+.if ${COMPILER_VERSION} >= 180
>+# Codebase currently uses unique(), which is deprecated and has been removed
>+# from libc++ 18. Upstream MR:
>+# https://invent.kde.org/pim/kleopatra/-/merge_requests/205.
>+CXXFLAGS+=	-D_LIBCPP_ENABLE_CXX20_REMOVED_SHARED_PTR_UNIQUE
>+.endif
>+.endif
> 
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 279139: 250798