From nobody Mon May 30 08:38:32 2022 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 C4B871B4585D; Mon, 30 May 2022 08:38:32 +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 4LBTMX561Vz4XLP; Mon, 30 May 2022 08:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653899912; 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=PeUiymOJRnMTY6g/ueAxmt3E1sbfmiJ7yUGpaJnS/0k=; b=Q4awjD+OqzFaTogepnIEpPj2DfRE1tSjABsfpWvT4jTKSOqJCEmF/aFONSkyzUdmJmdRuH kycuLOdoGweErReNuUv2UhoPXCLwC/sPTk19rWnn/IUF88WOmRWRfdCMhqEGWUFWVDg+tX XYSm2oAGFHSNTGBsISyoKsuGkkbpi9Qtv/mJpKCYZTEEm25/LufY+l0bouj+TjkOo+P9fz /M4Ur77BePEqHGkyOqwBQkPwHLdQ9due+7bZ6syAYayFH5SoYy3KAS8c73PoUxdgI60k4j Pn8bK72I8RFWoGan+I1GfGSrcGLTpg3vE7kltuyzPEvEXLGhOUPD0Z9KaZW8CA== 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 8B00713E4C; Mon, 30 May 2022 08:38:32 +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 24U8cWSc078640; Mon, 30 May 2022 08:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24U8cWR6078639; Mon, 30 May 2022 08:38:32 GMT (envelope-from git) Date: Mon, 30 May 2022 08:38:32 GMT Message-Id: <202205300838.24U8cWR6078639@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: 14e94b4f735b - main - editors/imhex: Update to 1.18.1 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: nobutaka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14e94b4f735b8341079942d31e963c04e729d2a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653899912; 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=PeUiymOJRnMTY6g/ueAxmt3E1sbfmiJ7yUGpaJnS/0k=; b=bMARC8lq4Htm0/GNx6VQ8w8Fl3lzr6FBFfttX6c2BOhnpLzfVafKyR3QpwXiJwozVYme/9 KYQUIjAQoHmRq4lZq8AsxZzrzxnf/yUfK8b96ZvA5IxfIuFiIMPvWlfJNX5alwQko1V0gQ lAQKTwx7CbeT4vuuS0ZtHIibx+OlxvoDW74N397IUa1A4DbYPTPZJq1wYx4KQtKVfooqBO 2O8bGVGwtNKg6oWTGgvsLSp+lA45e1caBYn9ak+uC7iPHyJxm8tmCoQLbODQ4i80Oqzicy rCimtS8Kk42vIMEhGz9+IJrUQJdnOSQNFchRHwxKN42psBn0see1cADXWGOjgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653899912; a=rsa-sha256; cv=none; b=TSvdxGAAFsMBKqdyCmIisZbIF/KN4q4vR03TiB+RscO2JQDIJdRWCQFb29NRDtZNmZwUi9 G2cVbMBMaFM8mJe1lFUiC0EqkndQd28Bnsz120x4a10aGkexftu2u2sOv+exipO3U0ez+A KMl1hXutYHsWs8FiK4ROEy5ZBFED198p3UjgUP5SFz0CnXDPKS5FYurk9JafHXPL03fUXi lV3BBMdQEp15hP10AjtbAfzc+/mMqbjDuIeuIgMi665E62d/vvWGVXBTZOVWiwxhE/9qyl +58ssxSPsU54TV7X1VwcEnp33mYDJlqGJIHkQLlcfD7LB9+EP31MP/4Gjoisdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=14e94b4f735b8341079942d31e963c04e729d2a4 commit 14e94b4f735b8341079942d31e963c04e729d2a4 Author: MANTANI Nobutaka AuthorDate: 2022-05-30 08:37:28 +0000 Commit: MANTANI Nobutaka CommitDate: 2022-05-30 08:38:04 +0000 editors/imhex: Update to 1.18.1 --- editors/imhex/Makefile | 7 +++---- editors/imhex/distinfo | 10 ++++----- ...tch-lib_libimhex_include_hex_api_keybinding.hpp | 11 ---------- ...atch-lib_libimhex_include_hex_helpers_utils.hpp | 24 ---------------------- .../files/patch-main_source_window_window.cpp | 4 ++-- ...ltin_source_content_views_view__hex__editor.cpp | 11 ++++++++++ 6 files changed, 21 insertions(+), 46 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index 5e48b4f72f3d..017209b85998 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -1,5 +1,5 @@ PORTNAME= imhex -PORTVERSION= 1.17.0 +PORTVERSION= 1.18.1 DISTVERSIONPREFIX= v CATEGORIES= editors MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg @@ -24,8 +24,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ WerWolv-PatternLanguage-${GH_TAG_PATTERN_LANGUAGE}_GH0${EXTRACT_SUFX} BUILD_DEPENDS= glm>0:math/glm \ - nlohmann-json>0:devel/nlohmann-json \ - ${LOCALBASE}/include/range/v3/range.hpp:devel/range-v3 + nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libglfw.so:graphics/glfw \ @@ -54,7 +53,7 @@ GH_TAG_FMT= bc654fa GH_TAG_IMHEX_PATTERNS= 4ec37de GH_TAG_LIBROMFS= f14e88a GH_TAG_NATIVEFILEDIALOG= 28ade5a -GH_TAG_PATTERN_LANGUAGE= 49bafd8 +GH_TAG_PATTERN_LANGUAGE= 23ec4e4 GH_TAG_YARA= 1367943 CMAKE_ARGS= -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo index 2ed552024e28..84f1d1f63dd1 100644 --- a/editors/imhex/distinfo +++ b/editors/imhex/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1651665999 +TIMESTAMP = 1653792475 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec SIZE (imhex/xdg.hpp) = 7674 -SHA256 (imhex/WerWolv-ImHex-v1.17.0_GH0.tar.gz) = 08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0 -SIZE (imhex/WerWolv-ImHex-v1.17.0_GH0.tar.gz) = 8723416 +SHA256 (imhex/WerWolv-ImHex-v1.18.1_GH0.tar.gz) = 55159316af07042d494570d0f6f8fcfdc9bbc0d3ebd35fe7d202d0f90d116b1e +SIZE (imhex/WerWolv-ImHex-v1.18.1_GH0.tar.gz) = 8726145 SHA256 (imhex/btzy-nativefiledialog-extended-28ade5a_GH0.tar.gz) = dcba95e4af561468fd30533882af0733a8e4df7a963c2a19eef9789c90807e28 SIZE (imhex/btzy-nativefiledialog-extended-28ade5a_GH0.tar.gz) = 409643 SHA256 (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 435d40757928fa73dec19c6d0fbf171bd76341391c8525ce1286927dab44c3e7 @@ -13,7 +13,7 @@ SHA256 (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 2afca72e2dd10a929d1341e69f1f SIZE (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 1284035 SHA256 (imhex/WerWolv-ImHex-Patterns-4ec37de_GH0.tar.gz) = 59e81f8d4dbeb21da5ddf6c6dcbf404b79c32d583f59a9be6d01c3468effa4bd SIZE (imhex/WerWolv-ImHex-Patterns-4ec37de_GH0.tar.gz) = 217951 -SHA256 (imhex/WerWolv-PatternLanguage-49bafd8_GH0.tar.gz) = 48080776130cdf3bed27dda4fd8b9babbcf6e77bbb375ff1125cc7f71b78da7e -SIZE (imhex/WerWolv-PatternLanguage-49bafd8_GH0.tar.gz) = 168895 +SHA256 (imhex/WerWolv-PatternLanguage-23ec4e4_GH0.tar.gz) = f7b405bfc37a19bdd538e94df7eaa6f42524fd6806a65c564c41b684909a7b5f +SIZE (imhex/WerWolv-PatternLanguage-23ec4e4_GH0.tar.gz) = 170287 SHA256 (imhex/WerWolv-libromfs-f14e88a_GH0.tar.gz) = cb375ae5b5539d19f6a17af1690e0b3cbbd0ad2e4282ce3c33efb94960ebff4b SIZE (imhex/WerWolv-libromfs-f14e88a_GH0.tar.gz) = 3600 diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_api_keybinding.hpp b/editors/imhex/files/patch-lib_libimhex_include_hex_api_keybinding.hpp deleted file mode 100644 index dd14015b2fab..000000000000 --- a/editors/imhex/files/patch-lib_libimhex_include_hex_api_keybinding.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libimhex/include/hex/api/keybinding.hpp.orig 2022-01-16 14:56:46 UTC -+++ lib/libimhex/include/hex/api/keybinding.hpp -@@ -7,6 +7,8 @@ - #include - #include - -+#include -+ - struct ImGuiWindow; - - namespace hex { diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_utils.hpp b/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_utils.hpp deleted file mode 100644 index 239e4d750c1f..000000000000 --- a/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_utils.hpp +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/libimhex/include/hex/helpers/utils.hpp.orig 2022-04-17 23:53:01 UTC -+++ lib/libimhex/include/hex/helpers/utils.hpp -@@ -94,6 +94,12 @@ namespace hex { - template - using SizeType = typename SizeTypeImpl::Type; - -+ // Workaround for FreeBSD versions that std::has_single_bit() is not available -+ template -+ constexpr bool has_single_bit(T x) { -+ return x != 0 && (((x & (x - 1)) == 0)); -+ } -+ - template - constexpr T changeEndianess(const T &value, std::endian endian) { - if (endian == std::endian::native) -@@ -106,7 +112,7 @@ namespace hex { - - SizeType swapped; - -- if constexpr (!std::has_single_bit(Size) || Size > 16) -+ if constexpr (!has_single_bit(Size) || Size > 16) - static_assert(always_false::value, "Invalid type provided!"); - - switch (Size) { diff --git a/editors/imhex/files/patch-main_source_window_window.cpp b/editors/imhex/files/patch-main_source_window_window.cpp index cd8164abd262..a7e0a5c9c081 100644 --- a/editors/imhex/files/patch-main_source_window_window.cpp +++ b/editors/imhex/files/patch-main_source_window_window.cpp @@ -1,4 +1,4 @@ ---- main/source/window/window.cpp.orig 2022-04-17 23:53:01 UTC +--- main/source/window/window.cpp.orig 2022-05-28 18:14:30 UTC +++ main/source/window/window.cpp @@ -148,7 +148,6 @@ namespace hex { std::signal(SIGSEGV, signalHandler); @@ -8,7 +8,7 @@ std::signal(SIGFPE, signalHandler); auto imhexLogo = romfs::get("logo.png"); -@@ -597,7 +596,7 @@ namespace hex { +@@ -607,7 +606,7 @@ namespace hex { return; for (int i = 0; i < count; i++) { diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp new file mode 100644 index 000000000000..8f17b860c16f --- /dev/null +++ b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp @@ -0,0 +1,11 @@ +--- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2022-05-28 18:14:30 UTC ++++ plugins/builtin/source/content/views/view_hex_editor.cpp +@@ -199,7 +199,7 @@ namespace hex::plugin::builtin { + reader.seek(this->m_searchPosition.value_or(editor->getSelection().getEndAddress())); + + constexpr static auto searchFunction = [](const auto &haystackBegin, const auto &haystackEnd, const auto &needleBegin, const auto &needleEnd) { +- #if defined(OS_MACOS) ++ #if defined(OS_MACOS) || defined(__FreeBSD__) + return std::search(haystackBegin, haystackEnd, needleBegin, needleEnd); + #else + return std::search(haystackBegin, haystackEnd, std::boyer_moore_horspool_searcher(needleBegin, needleEnd));