From nobody Wed Nov 23 13:37:52 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 4NHMdD5hQMz4hQDl; Wed, 23 Nov 2022 13:37:52 +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 4NHMdD5L0wz4ZCh; Wed, 23 Nov 2022 13:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669210672; 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=LFiJiVqtaAU6AZunh6DEE+hSbySOhykfzdSmGBDVhwA=; b=PYypY7WOxuWim974sz9kQSkISM/fLL9WGK/AAMG1ExfsAYontRc4pSwZ3VTYuJfw2lhsVZ hbqEfpJ/PHr3rp/3nPuWEQtl2MXVpRcyt7g/DuVxZzqWcsOjFxRYRzPfg0AlJgeKS2mz51 5udUTw9NYO44Th8VeOBwAdtACgexpU7D+FZziYwwMx4boOnwKN1ZqmfIwJjcW+bFWyoDXu HVTxhol1UGvkG/FdJxIpopl/3hcT2ML1LKY1eDZNlXON5YkS9q0Z20qstFXdcDVt6V7/Wr IluMpM9qwbzR7YXKiCA5KKum6R956X89knMHXVAVQAAi//X/r6V/N/KyGWI4pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669210672; 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=LFiJiVqtaAU6AZunh6DEE+hSbySOhykfzdSmGBDVhwA=; b=yY4PnF195ZrGkVOWQKr5onfVjACxW2O9cKKIIL976pC8NTfNV7P+RhecjMe12NPRUz6bdG x9ZfSTMjvi9rIv037HWbAMVl+VQFV5VNeZH/F3Ik7umONgI9fCDSA5wIKwYOz6EfuPmjXo j7LK9lSs5vVqwiMT7xzOL4dLFZTInJsVchWXq+te0sDfP1C+KxqF7Sbu4GltK1pGP2Q5lp OxiM3uJQENtUVZsmyZWQ76zNyeBv3QD1jugMkhvF5pPUb9kjSrsFTUNtg6eQcioaDIe7FM 7azpwcmBTCOMJ7tP0Hzrs+ytvIo9TW3g0ht98vOiy6Le6XSliurDdFuz+NWICg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669210672; a=rsa-sha256; cv=none; b=m5UIpU7ADw5qekiiT5zPHkjK8Pk5L9I+sZimOFwl4XTo5YJYaDrgb8/4jwzp/dqGgCeDNE v4fygspIqf7sCbLrnV51ETVQ9tCy4/MoW5OFa5F9WSRm3XbnT1bGO+XUgXQTKOqHknF4UY UeTRSgaJLmXCZEycsZ2ZLQa5oNZVWUmhzkuUQWwRQPhHXlaeLXlKxCvQAppgR8HaFOzo1T rG5EWvQ1HF5BQEPS49yil1M9pSxkkOqT2IJTuaW1haEzYee7tHfytZKjor/JGYWuS9uCgQ 4SRwG2Op7AtMWU56M42i2XbO08adeGmLmu7Pt0Vw5ooMXT+d3Buu7viVD9HANA== 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 4NHMdD480yzPCr; Wed, 23 Nov 2022 13:37:52 +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 2ANDbqxU041910; Wed, 23 Nov 2022 13:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ANDbqSE041909; Wed, 23 Nov 2022 13:37:52 GMT (envelope-from git) Date: Wed, 23 Nov 2022 13:37:52 GMT Message-Id: <202211231337.2ANDbqSE041909@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: 086e94d31874 - main - editors/imhex: Update to 1.25.0 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: 086e94d318749edd9526cbbb7282a0265ce977a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=086e94d318749edd9526cbbb7282a0265ce977a2 commit 086e94d318749edd9526cbbb7282a0265ce977a2 Author: MANTANI Nobutaka AuthorDate: 2022-11-23 13:35:50 +0000 Commit: MANTANI Nobutaka CommitDate: 2022-11-23 13:37:19 +0000 editors/imhex: Update to 1.25.0 --- editors/imhex/Makefile | 11 ++++---- editors/imhex/distinfo | 18 ++++++------- editors/imhex/files/patch-CMakeLists.txt | 11 +++++++- ...lib_external_libromfs_generator_source_main.cpp | 11 ++++++++ ...pattern__language_lib_include_pl_core_token.hpp | 4 +-- ...attern__language_lib_source_pl_helpers_file.cpp | 31 +++++++++------------- .../patch-lib_libimhex_source_api_imhex__api.cpp | 4 +-- ...include_content_views_view__pattern__editor.hpp | 19 +++++++++++++ ...ltin_source_content_views_view__hex__editor.cpp | 6 ++--- ..._source_content_views_view__pattern__editor.cpp | 29 ++++++++++++++++++++ editors/imhex/pkg-plist | 2 +- 11 files changed, 104 insertions(+), 42 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index 41e96e621458..e212860f14a0 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -1,5 +1,5 @@ PORTNAME= imhex -PORTVERSION= 1.24.3 +PORTVERSION= 1.25.0 DISTVERSIONPREFIX= v CATEGORIES= editors MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg @@ -28,7 +28,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ BUILD_DEPENDS= glm>0:math/glm \ nlohmann-json>0:devel/nlohmann-json \ - ${LOCALBASE}/include/range/v3/range.hpp:devel/range-v3 + ${LOCALBASE}/include/range/v3/range.hpp:devel/range-v3 \ + ${LOCALBASE}/include/hpx/functional.hpp:devel/hpx LIB_DEPENDS= libcurl.so:ftp/curl \ libglfw.so:graphics/glfw \ libfreetype.so:print/freetype2 \ @@ -57,11 +58,11 @@ GH_TUPLE= btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi GH_TAG_CAPSTONE= d5141c0 GH_TAG_CLI11= faea921 GH_TAG_FMT= a337011 -GH_TAG_IMHEX_PATTERNS= 8e70a55 +GH_TAG_IMHEX_PATTERNS= a9ada89 GH_TAG_JTHREAD= 0fa8d39 -GH_TAG_LIBROMFS= 8efe4c4 +GH_TAG_LIBROMFS= 53a6bf5 GH_TAG_NATIVEFILEDIALOG= d4df2b6 -GH_TAG_PATTERN_LANGUAGE= ab7d738 +GH_TAG_PATTERN_LANGUAGE= 7aeac4a GH_TAG_YARA= ba94b4f CMAKE_ARGS= -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON \ diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo index 58cfaee19cbf..cff429a8a5cb 100644 --- a/editors/imhex/distinfo +++ b/editors/imhex/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1665857378 +TIMESTAMP = 1669206632 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec SIZE (imhex/xdg.hpp) = 7674 -SHA256 (imhex/WerWolv-ImHex-v1.24.3_GH0.tar.gz) = 5d6780b2d4c3b92bbe7619dcae34138072a8ed9c540523d25760da237f01d279 -SIZE (imhex/WerWolv-ImHex-v1.24.3_GH0.tar.gz) = 11126282 +SHA256 (imhex/WerWolv-ImHex-v1.25.0_GH0.tar.gz) = c2d730df224252159f9be3d2a3cbf3a592bfe38101414e06f64b0ac1776ec2c2 +SIZE (imhex/WerWolv-ImHex-v1.25.0_GH0.tar.gz) = 11001840 SHA256 (imhex/btzy-nativefiledialog-extended-d4df2b6_GH0.tar.gz) = a0440e52bd25b8f85cb25ef68fe19ca39b4b0fad39358d5a501b317cad9d0f69 SIZE (imhex/btzy-nativefiledialog-extended-d4df2b6_GH0.tar.gz) = 412249 SHA256 (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 435d40757928fa73dec19c6d0fbf171bd76341391c8525ce1286927dab44c3e7 @@ -15,9 +15,9 @@ SHA256 (imhex/josuttis-jthread-0fa8d39_GH0.tar.gz) = ccd9c871dc2da9611e6d0cba5fc SIZE (imhex/josuttis-jthread-0fa8d39_GH0.tar.gz) = 4450456 SHA256 (imhex/VirusTotal-yara-ba94b4f_GH0.tar.gz) = 4c81120bff451a55deaa23b48155d3eb35955ce11a1d76fbfcbbe2c2e33770b9 SIZE (imhex/VirusTotal-yara-ba94b4f_GH0.tar.gz) = 1288534 -SHA256 (imhex/WerWolv-ImHex-Patterns-8e70a55_GH0.tar.gz) = 8d283e8806412d4083f9da9c7b1ff499bc7374394397bd7f270ba11277cd6df2 -SIZE (imhex/WerWolv-ImHex-Patterns-8e70a55_GH0.tar.gz) = 5176390 -SHA256 (imhex/WerWolv-PatternLanguage-ab7d738_GH0.tar.gz) = d7b5844a21622265a1ecd5184650177595cfa40a7bb17cb44f2104f29dc38ac5 -SIZE (imhex/WerWolv-PatternLanguage-ab7d738_GH0.tar.gz) = 415301 -SHA256 (imhex/WerWolv-libromfs-8efe4c4_GH0.tar.gz) = cc538b4add2a451c7c9be4237717b3231171cce56db51a956eaffd85d7f5af5b -SIZE (imhex/WerWolv-libromfs-8efe4c4_GH0.tar.gz) = 4078 +SHA256 (imhex/WerWolv-ImHex-Patterns-a9ada89_GH0.tar.gz) = fd1be6d54d1dfdeeb94cc3cb9789e6079cee80a0a3dc409b8d0c961eee747f17 +SIZE (imhex/WerWolv-ImHex-Patterns-a9ada89_GH0.tar.gz) = 5180991 +SHA256 (imhex/WerWolv-PatternLanguage-7aeac4a_GH0.tar.gz) = 170f3852353c28858fa3756b03f55a4a9bbd69561da071c36834bc00a56f19ca +SIZE (imhex/WerWolv-PatternLanguage-7aeac4a_GH0.tar.gz) = 420016 +SHA256 (imhex/WerWolv-libromfs-53a6bf5_GH0.tar.gz) = 2caa05a847665ebff301dd7e684b4c7a1a9cc903a3bc0a83d4dccfdc1ea616de +SIZE (imhex/WerWolv-libromfs-53a6bf5_GH0.tar.gz) = 3799 diff --git a/editors/imhex/files/patch-CMakeLists.txt b/editors/imhex/files/patch-CMakeLists.txt index 290002b6d217..210b207d0448 100644 --- a/editors/imhex/files/patch-CMakeLists.txt +++ b/editors/imhex/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2022-10-08 08:03:47 UTC +--- CMakeLists.txt.orig 2022-11-14 09:07:21 UTC +++ CMakeLists.txt +@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.20) + # Options + option(IMHEX_USE_BUNDLED_CA "Use the CA bundle in romfs instead of the system one" OFF) + option(IMHEX_PLUGINS_IN_SHARE "Put the plugins in share/imhex/plugins instead of lib[..]/imhex/plugins" OFF) +-option(IMHEX_STRIP_RELEASE "Strip the release builds" ON) ++option(IMHEX_STRIP_RELEASE "Strip the release builds" OFF) + option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF) + option(IMHEX_IGNORE_BAD_CLONE "Disable the bad clone prevention checks" OFF) + option(IMHEX_PATTERNS_PULL_MASTER "Download latest files from master branch of the ImHex-Patterns repo" OFF) @@ -23,8 +23,6 @@ project(imhex VERSION ${IMHEX_VERSION}) # Make sure project is configured correctly diff --git a/editors/imhex/files/patch-lib_external_libromfs_generator_source_main.cpp b/editors/imhex/files/patch-lib_external_libromfs_generator_source_main.cpp new file mode 100644 index 000000000000..70f22d9a5651 --- /dev/null +++ b/editors/imhex/files/patch-lib_external_libromfs_generator_source_main.cpp @@ -0,0 +1,11 @@ +--- lib/external/libromfs/generator/source/main.cpp.orig 2022-11-23 12:47:55 UTC ++++ lib/external/libromfs/generator/source/main.cpp +@@ -87,7 +87,7 @@ int main() { + for (std::uint64_t i = 0; i < identifierCount; i++) { + std::printf("libromfs: Bundling resource: %s\n", paths[i].string().c_str()); + +- outputFile << " " << "{ \"" << paths[i].string() << "\", romfs::Resource({ reinterpret_cast(resource_" LIBROMFS_PROJECT_NAME "_" << i << ".data()), " << "resource_" LIBROMFS_PROJECT_NAME "_" << i << ".size() }) " << "},\n"; ++ outputFile << " " << "{ \"" << paths[i].string() << "\", romfs::Resource({ reinterpret_cast(resource_" LIBROMFS_PROJECT_NAME "_" << i << ".data()), " << "resource_" LIBROMFS_PROJECT_NAME "_" << i << ".size() - 1 }) " << "},\n"; + } + outputFile << "};"; + } diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp index 6f6e219eae3d..ad9cdf6ce02e 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp @@ -1,4 +1,4 @@ ---- lib/external/pattern_language/lib/include/pl/core/token.hpp.orig 2022-10-15 20:26:43 UTC +--- lib/external/pattern_language/lib/include/pl/core/token.hpp.orig 2022-11-19 17:06:38 UTC +++ lib/external/pattern_language/lib/include/pl/core/token.hpp @@ -148,9 +148,9 @@ namespace pl::core { @@ -17,7 +17,7 @@ namespace tkn { - constexpr inline Token createToken(const core::Token::Type type, const core::Token::ValueTypes &value) { -+ inline Token createToken(const core::Token::Type type, const core::Token::ValueTypes &value) { ++ inline pl::core::Token createToken(const core::Token::Type type, const core::Token::ValueTypes &value) { return { type, value, 1, 1 }; } diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_helpers_file.cpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_helpers_file.cpp index 493d143c3cf4..a0e9d7509c14 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_helpers_file.cpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_helpers_file.cpp @@ -1,22 +1,15 @@ ---- lib/external/pattern_language/lib/source/pl/helpers/file.cpp.orig 2022-08-14 15:37:26 UTC +--- lib/external/pattern_language/lib/source/pl/helpers/file.cpp.orig 2022-11-16 14:22:38 UTC +++ lib/external/pattern_language/lib/source/pl/helpers/file.cpp -@@ -19,12 +19,12 @@ namespace pl::hlp::fs { - this->m_file = _wfopen(path.c_str(), L"w+b"); - #else - if (mode == File::Mode::Read) -- this->m_file = fopen64(path.string().c_str(), "rb"); -+ this->m_file = fopen(path.string().c_str(), "rb"); - else if (mode == File::Mode::Write) -- this->m_file = fopen64(path.string().c_str(), "r+b"); -+ this->m_file = fopen(path.string().c_str(), "r+b"); - - if (mode == File::Mode::Create || (mode == File::Mode::Write && this->m_file == nullptr)) -- this->m_file = fopen64(path.string().c_str(), "w+b"); -+ this->m_file = fopen(path.string().c_str(), "w+b"); - #endif - } +@@ -8,7 +8,7 @@ + + namespace pl::hlp::fs { -@@ -52,7 +52,7 @@ namespace pl::hlp::fs { +-#if defined(OS_MACOS) ++#if defined(OS_MACOS) || defined(__FreeBSD__) + #define fopen64 fopen + #define ftruncate64 ftruncate + #endif +@@ -57,7 +57,7 @@ namespace pl::hlp::fs { void File::seek(u64 offset) { @@ -25,7 +18,7 @@ } void File::close() { -@@ -137,10 +137,10 @@ namespace pl::hlp::fs { +@@ -142,10 +142,10 @@ namespace pl::hlp::fs { size_t File::getSize() const { if (!isValid()) return 0; @@ -40,7 +33,7 @@ if (size < 0) return 0; -@@ -151,7 +151,7 @@ namespace pl::hlp::fs { +@@ -156,7 +156,7 @@ namespace pl::hlp::fs { void File::setSize(u64 size) { if (!isValid()) return; diff --git a/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp b/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp index 24945986719f..0bea605d4827 100644 --- a/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp +++ b/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp @@ -1,4 +1,4 @@ ---- lib/libimhex/source/api/imhex_api.cpp.orig 2022-10-08 08:03:47 UTC +--- lib/libimhex/source/api/imhex_api.cpp.orig 2022-11-14 09:07:21 UTC +++ lib/libimhex/source/api/imhex_api.cpp @@ -4,6 +4,7 @@ #include @@ -8,7 +8,7 @@ #include #include -@@ -266,7 +267,7 @@ namespace hex { +@@ -272,7 +273,7 @@ namespace hex { } bool isDirty() { diff --git a/editors/imhex/files/patch-plugins_builtin_include_content_views_view__pattern__editor.hpp b/editors/imhex/files/patch-plugins_builtin_include_content_views_view__pattern__editor.hpp new file mode 100644 index 000000000000..1ea8e959ef00 --- /dev/null +++ b/editors/imhex/files/patch-plugins_builtin_include_content_views_view__pattern__editor.hpp @@ -0,0 +1,19 @@ +--- plugins/builtin/include/content/views/view_pattern_editor.hpp.orig 2022-11-14 09:07:21 UTC ++++ plugins/builtin/include/content/views/view_pattern_editor.hpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + +@@ -65,7 +66,7 @@ namespace hex::plugin::builtin { + bool m_syncPatternSourceCode = false; + bool m_autoLoadPatterns = true; + +- std::map> m_sectionWindowDrawer; ++ std::map> m_sectionWindowDrawer; + private: + void drawConsole(ImVec2 size, const std::vector> &console); + void drawEnvVars(ImVec2 size, std::list &envVars); 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 index bea962f71143..ba671e2666d4 100644 --- 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 @@ -1,7 +1,7 @@ ---- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2022-10-12 10:48:50 UTC +--- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2022-11-14 09:07:21 UTC +++ plugins/builtin/source/content/views/view_hex_editor.cpp -@@ -290,7 +290,7 @@ namespace hex::plugin::builtin { - reader.seek(this->m_searchPosition.value_or(0x00)); +@@ -296,7 +296,7 @@ namespace hex::plugin::builtin { + reader.seek(this->m_searchPosition.value_or(provider->getBaseAddress())); constexpr static auto searchFunction = [](const auto &haystackBegin, const auto &haystackEnd, const auto &needleBegin, const auto &needleEnd) { - return std::search(haystackBegin, haystackEnd, std::boyer_moore_horspool_searcher(needleBegin, needleEnd)); diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__pattern__editor.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__pattern__editor.cpp new file mode 100644 index 000000000000..7372fc620a86 --- /dev/null +++ b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__pattern__editor.cpp @@ -0,0 +1,29 @@ +--- plugins/builtin/source/content/views/view_pattern_editor.cpp.orig 2022-11-23 07:51:06 UTC ++++ plugins/builtin/source/content/views/view_pattern_editor.cpp +@@ -461,7 +461,7 @@ namespace hex::plugin::builtin { + dataProvider->setReadOnly(true); + + auto hexEditor = ui::HexEditor(); +- hexEditor.setBackgroundHighlightCallback([this, id](u64 address, const u8 *, size_t) -> std::optional { ++ hexEditor.setBackgroundHighlightCallback([this, id = id](u64 address, const u8 *, size_t) -> std::optional { + if (this->m_runningEvaluators != 0) + return std::nullopt; + if (!ImHexApi::Provider::isValid()) +@@ -483,7 +483,7 @@ namespace hex::plugin::builtin { + + auto patternProvider = ImHexApi::Provider::get(); + +- this->m_sectionWindowDrawer[patternProvider] = [id, patternProvider, dataProvider = std::move(dataProvider), hexEditor, patternDrawer = ui::PatternDrawer()] mutable { ++ this->m_sectionWindowDrawer[patternProvider] = [id=id, patternProvider, dataProvider = std::move(dataProvider), hexEditor, patternDrawer = ui::PatternDrawer()] mutable { + hexEditor.setProvider(dataProvider.get()); + hexEditor.draw(480_scaled); + +@@ -944,7 +944,7 @@ namespace hex::plugin::builtin { + if (type->isTemplateType()) + continue; + +- createNestedMenu(hex::splitString(typeName, "::"), [&] { ++ createNestedMenu(hex::splitString(typeName, "::"), [&, typeName=typeName] { + std::string variableName; + for (char &c : hex::replaceStrings(typeName, "::", "_")) + variableName += static_cast(std::tolower(c)); diff --git a/editors/imhex/pkg-plist b/editors/imhex/pkg-plist index bcd5457bc959..be18e512855b 100644 --- a/editors/imhex/pkg-plist +++ b/editors/imhex/pkg-plist @@ -1,5 +1,5 @@ bin/imhex -lib/libimhex.so.1.24.3 +lib/libimhex.so.1.25.0 share/applications/imhex.desktop %%DATADIR%%/constants/_schema.json %%DATADIR%%/constants/crc16.json