From nobody Thu Oct 31 19:35: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 4XfZ2w5Wtfz5cFfx; Thu, 31 Oct 2024 19:35:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfZ2w4c9Xz4LLf; Thu, 31 Oct 2024 19:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730403320; 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=GwFk5UvNnGEmPFxMPgjAwhzVDiUktGVb194VbYBPzLM=; b=bkO3/VcrUdAa6FOsHEkUO9IHdaKXLuSbkf8zaAVgPznvNb4U/LhnWkZb02XXMVxEpKAgTI mAR0BSkqKNn0O8Ef8n0LEoNKqktbf+4PB9rQwK/zvTDdfhnVPuB4hTFIZhMUay9iOqXYOz KtcSZ1QNwHD8fD0kes7na/P0UfVgRwV80PomEg2mVFXGppuxxJpc+Y92lc0BwoZzgPD9fH xBwbV2iIzx5MNn/o62HCs+a8B6x1+DN/xMIlDxbjmBcN7KSMdL9x9GT8aIo8mPbNUyLuts /QF0WHgqlcvWXndms9O/FkezrhQDI9UUnGi10dUJl7DCYosLivyz4MAIwyga2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730403320; 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=GwFk5UvNnGEmPFxMPgjAwhzVDiUktGVb194VbYBPzLM=; b=qwMqDLsRmf8ouwsrRGkJAPDitGNJBT1b+P95lUT+pywdETB/D+0vddQyXxXX9G8CB1x7Z3 Q9gKc/Dcm2TWoIKjfl1WxfD0kscl0yLrM12aE4hdeAtF3Gnr9AKV8HJyIfA9YmfwgXhODH 44jk85QKSJ8/wysPvDoKl4g6+7D/OTUn2AKfpdoZpKuVwTn/FpeuLQDNvOXfdGL2tey6BW wNZ+EIa4xNtQQ8Zvm8zorhX9HBV5TrGTE4CmzE6SkDMYwD7ie2vXYJHaYOLYpyrWg/x/qW nPrtGIMz8j74Te/FmtRGYKGxUSYZWAc2MCztwVZE+LZGSGd+cpWsGn3DbbMUmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730403320; a=rsa-sha256; cv=none; b=ACLgR1eD4zFKnvmPCGWeCtoeoLNNzKxEvF13Od1Nj+OAnhmIhlFGkAtWQrkuufR3yonEz1 v+qB9D6iCQtg5ztnTJJezh7M48NYbxoL6/p/VQDp06QxSKWUMTcSy5yuGk4kucszWj1scy CWkllaOAicKwPofmVkea+1RCNyLfN41ToUdavhewS5Z+FzzVZFg4fmjRjrlfPc/hCwKAnE llu2xE4IJ0TxI5jFCYnKiVM94LoQppMjUw64z7rhaowVNULpFpKMu/HSf7S3ltzTQG4CjO LBX/chanKm6k9yWr4h0OjOg6Ugy5WF0z5qTjb22hw9tP7x5jTRk7VdXP4pWHUg== 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 4XfZ2w4C9NzpjB; Thu, 31 Oct 2024 19:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49VJZK4D069872; Thu, 31 Oct 2024 19:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VJZKAD069869; Thu, 31 Oct 2024 19:35:20 GMT (envelope-from git) Date: Thu, 31 Oct 2024 19:35:20 GMT Message-Id: <202410311935.49VJZKAD069869@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 0454a541d706 - main - cad/librepcb: Unbreak on 15 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0454a541d7069ff76124a3a8ed6440830d24f985 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0454a541d7069ff76124a3a8ed6440830d24f985 commit 0454a541d7069ff76124a3a8ed6440830d24f985 Author: Yuri Victorovich AuthorDate: 2024-10-31 19:34:54 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-31 19:35:18 +0000 cad/librepcb: Unbreak on 15 --- cad/librepcb/Makefile | 2 -- .../files/patch-libs_optional_tl_optional.hpp | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/cad/librepcb/Makefile b/cad/librepcb/Makefile index 61848df352d4..59d3cb64c5c2 100644 --- a/cad/librepcb/Makefile +++ b/cad/librepcb/Makefile @@ -13,8 +13,6 @@ WWW= https://librepcb.org/ \ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BROKEN_FreeBSD_15= compilation error: no member named 'construct' in 'optional', see https://github.com/LibrePCB/LibrePCB/issues/1454 - LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg4 \ libfontconfig.so:x11-fonts/fontconfig \ libfreeimage.so:graphics/freeimage \ diff --git a/cad/librepcb/files/patch-libs_optional_tl_optional.hpp b/cad/librepcb/files/patch-libs_optional_tl_optional.hpp new file mode 100644 index 000000000000..96d0ce2baa5b --- /dev/null +++ b/cad/librepcb/files/patch-libs_optional_tl_optional.hpp @@ -0,0 +1,22 @@ +- workaround for https://github.com/LibrePCB/LibrePCB/issues/1454 + +--- libs/optional/tl/optional.hpp.orig 2024-10-31 19:31:32 UTC ++++ libs/optional/tl/optional.hpp +@@ -1979,17 +1979,6 @@ template class optional { (public) + return *this; + } + +- /// Constructs the value in-place, destroying the current one if there is +- /// one. +- template T &emplace(Args &&... args) noexcept { +- static_assert(std::is_constructible::value, +- "T must be constructible with Args"); +- +- *this = nullopt; +- this->construct(std::forward(args)...); +- return value(); +- } +- + void swap(optional &rhs) noexcept { std::swap(m_value, rhs.m_value); } + + /// Returns a pointer to the stored value