From nobody Sat Apr 13 18:58:21 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 4VH2l159Ljz5HxYq; Sat, 13 Apr 2024 18:58: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 4VH2l12kN8z4dcD; Sat, 13 Apr 2024 18:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713034701; 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=x+03r9g83CmUHjsbMYAsIL2eSw7Er5qtK0jPtMFjN7M=; b=Qu/sqYy9joJ7bzDOO5diXGv2YLaI9hgRNpDO/NDJ9sIvnkj/ot+wG4mEhcO5+/UYGMH8AA 1RlK7X/PSWS501libk2ubCEoBMO0e/2m0eajcrmwMD+ikH5B9B/qyhC/CqMl8haAfZUq27 IWJffUNGDTN7uzohoa6yrYGwF29quavmIu+7rY6noucj7cgh+kMoWR4i5FvmH1CDyYN6ry NR9PQplaeB5Dx/u88klLL0RkDlYFpD0p48OFCGe4McmJ8FiJlnve7xBhv5rhG7lZKRUiN5 AgSwIMOWMtZQb88u13Za1eHf361Rt8ddxnBwqr5rlBgbmXeuy1wRqAT2oKSsAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713034701; a=rsa-sha256; cv=none; b=EnAtU7J0ToADNLzXoZ9LSejMW26/FSr4umNfapZp5E2cJocAuMb/VkloOjwIH7oFfqCNaV 8MirEwwEhbcKQlyARNPKr6GJgRpoKNWz4RQLl8id3TuuSgIwDUUwGR35Uk9+coL2/CFdkw JcU4kbOKM/ZKXSPzUzpDz+//5yr/XDcgR1rZuHnUAW2oseKdun8xfXbbS8cvOsuvngDFay IPKUfGj/9QqrxL7/pWRJKIyKMf4qQLRX9Yr0+VUrrr1pyfqiHjpdewss2VV4SD9/IMoakv URGMopVHt/jjzCKnefK9EqYW2m5xCS3j07n3/xyv/tC49ChR03eCnH7xN/RlkA== 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=1713034701; 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=x+03r9g83CmUHjsbMYAsIL2eSw7Er5qtK0jPtMFjN7M=; b=JAFcTyijkfoDVCtCoBeJZ5x3TqwEn8KTGrGc473IiFgPVNZZNeKUAcHZWxShmZn2/EyKUW RL7iUiCIlPFSaW4ezpz2GnGoBn7eRfKNd/x5pIsGF7Omd5ATxhsyT6MparA7fmORYqOkDP 9pjiNzE901vPZRz4KKgDqpvEanrClOTfWAHLAU+wLgx9BMy+t/kXmbKxgwKhsLpD/w2Ncr 5vTK14wPf3SDE9WZdk1BnKI+GGR7mkRqPb6mBQPsZgSdtTd3CQrEsN0FSGVib3qZR0TBNn 3e6/lSCDwWKCLX7O5SOt4Hs1IYtU4p60VPdSkGEhsIO4FbZQxKHIHR6hxamCYg== 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 4VH2l12CxBzkGG; Sat, 13 Apr 2024 18:58:21 +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 43DIwLNG088816; Sat, 13 Apr 2024 18:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43DIwLip088813; Sat, 13 Apr 2024 18:58:21 GMT (envelope-from git) Date: Sat, 13 Apr 2024 18:58:21 GMT Message-Id: <202404131858.43DIwLip088813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: MANTANI Nobutaka Subject: git: f19e878e0cd5 - main - editors/imhex-current: Fix build error on 15-CURRENT 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nobutaka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f19e878e0cd5cb69ea68a977df2ffd545290c870 Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=f19e878e0cd5cb69ea68a977df2ffd545290c870 commit f19e878e0cd5cb69ea68a977df2ffd545290c870 Author: MANTANI Nobutaka AuthorDate: 2024-04-13 18:57:16 +0000 Commit: MANTANI Nobutaka CommitDate: 2024-04-13 18:57:16 +0000 editors/imhex-current: Fix build error on 15-CURRENT --- editors/imhex-current/Makefile | 9 ++++++++- .../patch-lib_libimhex_include_hex_api_content__registry.hpp | 10 ++++++++++ .../patch-lib_third__party_jthread_includes_jthread.hpp | 12 ++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/editors/imhex-current/Makefile b/editors/imhex-current/Makefile index 2de90cbe21c1..d4c251b1ab77 100644 --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -104,6 +104,11 @@ NLS_USES= gettext IGNORE= requires libc++ of LLVM 17 on the base system .endif +# After LLVM 18 import into the base system +.if (${OSVERSION} <= 1500018) +CXXFLAGS+= -fexperimental-library -D_LIBCPP_ENABLE_EXPERIMENTAL +.endif + post-extract: ${CP} -R ${WRKSRC_libromfs}/* ${WRKSRC}/lib/external/libromfs ${CP} -R ${WRKSRC_libwolv}/* ${WRKSRC}/lib/external/libwolv @@ -115,13 +120,15 @@ post-extract: ${CP} -R ${WRKSRC_edlib}/* ${WRKSRC}/lib/third_party/edlib ${CP} -R ${WRKSRC_fmt}/* ${WRKSRC}/lib/third_party/fmt ${CP} -R ${WRKSRC_hashlibplus}/* ${WRKSRC}/lib/third_party/HashLibPlus - ${CP} -R ${WRKSRC_jthread}/* ${WRKSRC}/lib/third_party/jthread ${CP} -R ${WRKSRC_nativefiledialog}/* ${WRKSRC}/lib/third_party/nativefiledialog ${CP} -R ${WRKSRC_yara}/* ${WRKSRC}/lib/third_party/yara/yara ${MKDIR} ${WRKDIR}/.build/_deps/imhex_patterns_src ${CP} -R ${WRKSRC_imhex_patterns}/* ${WRKDIR}/.build/_deps/imhex_patterns_src ${CP} -R ${WRKDIR}/imhex-bastion-pats-${GL_TAG_IMHEX_BASTION_PATS}/* ${WRKDIR}/.build/_deps/imhex_patterns_src/patterns/bastion ${CP} -R ${WRKDIR}/imhex-ffx-pats-${GL_TAG_IMHEX_FFX_PATS}/* ${WRKDIR}/.build/_deps/imhex_patterns_src/patterns/ffx +.if (${OSVERSION} < 1500018) + ${CP} -R ${WRKSRC_jthread}/* ${WRKSRC}/lib/third_party/jthread +.endif post-patch: ${CP} -R ${WRKSRC}/lib/external/libwolv/* ${WRKSRC}/lib/external/pattern_language/external/libwolv diff --git a/editors/imhex-current/files/patch-lib_libimhex_include_hex_api_content__registry.hpp b/editors/imhex-current/files/patch-lib_libimhex_include_hex_api_content__registry.hpp new file mode 100644 index 000000000000..df20b533c0ee --- /dev/null +++ b/editors/imhex-current/files/patch-lib_libimhex_include_hex_api_content__registry.hpp @@ -0,0 +1,10 @@ +--- lib/libimhex/include/hex/api/content_registry.hpp.orig 2024-04-13 11:25:28 UTC ++++ lib/libimhex/include/hex/api/content_registry.hpp +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/editors/imhex-current/files/patch-lib_third__party_jthread_includes_jthread.hpp b/editors/imhex-current/files/patch-lib_third__party_jthread_includes_jthread.hpp new file mode 100644 index 000000000000..dfda843ed3ad --- /dev/null +++ b/editors/imhex-current/files/patch-lib_third__party_jthread_includes_jthread.hpp @@ -0,0 +1,12 @@ +--- lib/third_party/jthread/includes/jthread.hpp.orig 2024-04-13 11:34:49 UTC ++++ lib/third_party/jthread/includes/jthread.hpp +@@ -1,6 +1,8 @@ + #pragma once + +-#if __cpp_lib_jthread >= 201911L ++#include ++ ++#if __cpp_lib_jthread >= 201911L || __FreeBSD_version >= 1500018 + #include + #else + #include "../jthread/source/jthread.hpp"