From nobody Wed Jul 06 16:47:38 2022 X-Original-To: dev-commits-ports-all@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 772A61D0A5A2; Wed, 6 Jul 2022 16:47:38 +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 4LdQSp2dxzz4tvt; Wed, 6 Jul 2022 16:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657126058; 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=0IG+ifmoE+hussQ0Jm2XkeLfSw50/IZqPgmy5atFtxA=; b=SflewA3LaXNBkwkm+jC4NGhhTdIL3XNAmYcQCMAk/1GKCCxf+f2+Zcsl4l2Q3rVnyGCUkZ 1M4wsxvqy8Hijl4NE0YNAVeQjLz6nlWNdOF0tRgnNEm+7OTaqMKW+5ktRPhK2i0hmBqHra w8qjlhQORj5J9b/pN14bK82eL7ixERnUOAT/rKY5t41QfOqkLdBce74XXxuo70QKX7ym2p GQMBB51Gj957Jc7+Ocpzsz7+wGwxcUaIlOfXejAQX0wyYTm6jRQ+pxSQN2zwzi2KTTxkCI 4WwF4HEd0P366VdJ4JC8+GrIREmB7eF59TwqWdQbpEwblzxDhPyEHScRjhElYw== 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 37B961DFCB; Wed, 6 Jul 2022 16:47:38 +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 266Glca5055792; Wed, 6 Jul 2022 16:47:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266Glcbc055791; Wed, 6 Jul 2022 16:47:38 GMT (envelope-from git) Date: Wed, 6 Jul 2022 16:47:38 GMT Message-Id: <202207061647.266Glcbc055791@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: 2a2f3c8d6253 - main - editors/imhex: Update to 1.19.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 2a2f3c8d6253e22437f65e1a682a1a77078030f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657126058; 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=0IG+ifmoE+hussQ0Jm2XkeLfSw50/IZqPgmy5atFtxA=; b=oy1BgM7QfJ8udjZIg3aF2Cxer+M9xJbvOe63HhNXsR/WT/Rjp/atwmxvD/lJiKFoaqowuW 1qdW7p4/y/5/YLBqZNmcyirpDZpiSf386RP0EFShB9Hiz145maulqv7SEfSV+eGXN3crhO boGGTQDhYOIyWTu7v4rMAgTOBBsSSzXQuNfCPKlnZDU6L3iEpSd4SfMCe0QTmuC2O0k+sa jHuaizpVqDqnnE1Jp9csqu9GZ7Hg9JfmfnOMKA0CviBOo9Dg35EnJGzM0RLDqnaCmO46k/ SY3ULm5Gaopt3imzJTth68VwxrYVhF4zpGespV5INl9o60uMw3EQeEPWfKfRlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657126058; a=rsa-sha256; cv=none; b=u/FXhJHwRG2dov2fSfLCvEcXeK0T8qdp5bXWNFeOnTf91DUcIADpGlRF/fb6iLXIbQN9dA gKvAp3pkAJK9rxwzeJXZpSWQsIpIGtHhUFLniedXUULNTUwkOtUB/xQ/xysr4aW0mAZNkM 0a/I9OOW6YvmOYQWseEwFaXUQP7TK7gfnKtB/Wnn2um2pFuAArxoDqWNU4sR6o0SV6Xgzv yXZDiH97BQlb33V9B6RsfgQgyd6smL9uiCMqPiua3X//Q78kfEGY6u22K/et4hXta3RKqE tuE35uOX19WDd/0ySqiSufV26m0xAg3DNu+DDrslEcZPMZ4Na0RpH1HC2mYLBw== 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=2a2f3c8d6253e22437f65e1a682a1a77078030f9 commit 2a2f3c8d6253e22437f65e1a682a1a77078030f9 Author: MANTANI Nobutaka AuthorDate: 2022-07-06 16:45:20 +0000 Commit: MANTANI Nobutaka CommitDate: 2022-07-06 16:46:51 +0000 editors/imhex: Update to 1.19.0 --- editors/imhex/Makefile | 8 ++--- editors/imhex/distinfo | 18 +++++------ editors/imhex/files/patch-CMakeLists.txt | 4 +-- .../imhex/files/patch-cmake_build__helpers.cmake | 8 ++--- ..._include_pl_patterns_pattern__array__static.hpp | 11 +++++++ ...ge_lib_include_pl_patterns_pattern__padding.hpp | 11 +++++++ ...l_pattern__language_lib_source_helpers_file.cpp | 36 +++++++++++----------- ...ttern__language_lib_source_pl_libstd_string.cpp | 11 +++++++ .../patch-lib_libimhex_source_helpers_file.cpp | 36 +++++++++++----------- .../files/patch-main_source_window_window.cpp | 4 +-- ...iltin_source_content_pl__builtin__functions.cpp | 11 ------- ...ltin_source_content_views_view__hex__editor.cpp | 12 ++++---- editors/imhex/pkg-plist | 1 + 13 files changed, 97 insertions(+), 74 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index c83216f6a012..96ed6d02f154 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -1,5 +1,5 @@ PORTNAME= imhex -PORTVERSION= 1.18.2 +PORTVERSION= 1.19.0 DISTVERSIONPREFIX= v CATEGORIES= editors MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg @@ -50,10 +50,10 @@ GH_TUPLE= btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi GH_TAG_CAPSTONE= d5141c0 GH_TAG_FMT= bc654fa -GH_TAG_IMHEX_PATTERNS= 68edebb -GH_TAG_LIBROMFS= f14e88a +GH_TAG_IMHEX_PATTERNS= 48dd8f6 +GH_TAG_LIBROMFS= 1206307 GH_TAG_NATIVEFILEDIALOG= 28ade5a -GH_TAG_PATTERN_LANGUAGE= 31ae577 +GH_TAG_PATTERN_LANGUAGE= 5ab7704 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 cebe4816dbc1..e859e3c4ec99 100644 --- a/editors/imhex/distinfo +++ b/editors/imhex/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1654429164 +TIMESTAMP = 1657029216 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec SIZE (imhex/xdg.hpp) = 7674 -SHA256 (imhex/WerWolv-ImHex-v1.18.2_GH0.tar.gz) = ed62731cc3725146c51f8ea45517d600a93df1616d75722f754a9bc7d4b62ee3 -SIZE (imhex/WerWolv-ImHex-v1.18.2_GH0.tar.gz) = 8740373 +SHA256 (imhex/WerWolv-ImHex-v1.19.0_GH0.tar.gz) = 28d8937d14b5d73cafcf17350dc1b1d2a26cff9c3ec36718d8922efecc3f896a +SIZE (imhex/WerWolv-ImHex-v1.19.0_GH0.tar.gz) = 10621864 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 @@ -11,9 +11,9 @@ SHA256 (imhex/fmtlib-fmt-bc654fa_GH0.tar.gz) = 90d5bbae46999d81510e671b49a356cd9 SIZE (imhex/fmtlib-fmt-bc654fa_GH0.tar.gz) = 826857 SHA256 (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 2afca72e2dd10a929d1341e69f1f6d170d421f04a3d6f3321bb8fb4b8982cf07 SIZE (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 1284035 -SHA256 (imhex/WerWolv-ImHex-Patterns-68edebb_GH0.tar.gz) = 1f4569a24c075858a154e65d9a626875545ea8c94854c86f22932be4f8817b95 -SIZE (imhex/WerWolv-ImHex-Patterns-68edebb_GH0.tar.gz) = 217948 -SHA256 (imhex/WerWolv-PatternLanguage-31ae577_GH0.tar.gz) = 48b2a62c5f4e1eda9aff04a06333d0d414e87a0d02c651415e419d8682d9e3e1 -SIZE (imhex/WerWolv-PatternLanguage-31ae577_GH0.tar.gz) = 170295 -SHA256 (imhex/WerWolv-libromfs-f14e88a_GH0.tar.gz) = cb375ae5b5539d19f6a17af1690e0b3cbbd0ad2e4282ce3c33efb94960ebff4b -SIZE (imhex/WerWolv-libromfs-f14e88a_GH0.tar.gz) = 3600 +SHA256 (imhex/WerWolv-ImHex-Patterns-48dd8f6_GH0.tar.gz) = bc4f1b6735f955b2ae691a2c13b3122a83e627c0331aea415ebea255d383f88a +SIZE (imhex/WerWolv-ImHex-Patterns-48dd8f6_GH0.tar.gz) = 322649 +SHA256 (imhex/WerWolv-PatternLanguage-5ab7704_GH0.tar.gz) = 6f16189d5912f451630575f75dd0c111c25797dcd7a51e07f08246efca040e35 +SIZE (imhex/WerWolv-PatternLanguage-5ab7704_GH0.tar.gz) = 175542 +SHA256 (imhex/WerWolv-libromfs-1206307_GH0.tar.gz) = 2b5422ea6efbfc0daa1e4bae5ad1739e35aaf3fa1f854aa54d45c426a554ddd5 +SIZE (imhex/WerWolv-libromfs-1206307_GH0.tar.gz) = 3595 diff --git a/editors/imhex/files/patch-CMakeLists.txt b/editors/imhex/files/patch-CMakeLists.txt index 256c61a51235..573edc91cf80 100644 --- a/editors/imhex/files/patch-CMakeLists.txt +++ b/editors/imhex/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2022-03-03 13:32:30 UTC +--- CMakeLists.txt.orig 2022-07-04 19:53:18 UTC +++ CMakeLists.txt -@@ -11,7 +11,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmak +@@ -12,7 +12,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmak # Make sure project is configured correctly setDefaultBuiltTypeIfUnset() diff --git a/editors/imhex/files/patch-cmake_build__helpers.cmake b/editors/imhex/files/patch-cmake_build__helpers.cmake index 401997ffd956..b591abc1a075 100644 --- a/editors/imhex/files/patch-cmake_build__helpers.cmake +++ b/editors/imhex/files/patch-cmake_build__helpers.cmake @@ -1,9 +1,9 @@ ---- cmake/build_helpers.cmake.orig 2022-03-03 13:32:30 UTC +--- cmake/build_helpers.cmake.orig 2022-07-04 19:53:18 UTC +++ cmake/build_helpers.cmake -@@ -284,17 +284,9 @@ endmacro() +@@ -289,17 +289,9 @@ endmacro() - function(downloadImHexPatternsFiles) + function(downloadImHexPatternsFiles dest) - FetchContent_Declare( - imhex_patterns - GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git @@ -14,7 +14,7 @@ - set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic) foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL}) -- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION "./") +- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest}) + install(DIRECTORY "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src/${FOLDER}" DESTINATION "share/imhex/") endforeach() diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp new file mode 100644 index 000000000000..a23b2f00d34b --- /dev/null +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp @@ -0,0 +1,11 @@ +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp.orig 2022-07-05 14:38:01 UTC ++++ lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp +@@ -48,7 +48,7 @@ namespace pl { + return result; + } + +- virtual void setMemoryLocationType(PatternMemoryType type) { ++ void setMemoryLocationType(PatternMemoryType type) override { + if (this->m_template != nullptr) + this->m_template->setMemoryLocationType(type); + diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp new file mode 100644 index 000000000000..35b8c67cc7f3 --- /dev/null +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp @@ -0,0 +1,11 @@ +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp.orig 2022-07-05 14:42:02 UTC ++++ lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp +@@ -16,7 +16,7 @@ namespace pl { + return ""; + } + +- [[nodiscard]] virtual std::vector> getChildren() { ++ [[nodiscard]] std::vector> getChildren() override { + return { }; + } + diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_helpers_file.cpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_helpers_file.cpp index b378eac067a9..571fabd78504 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_helpers_file.cpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_helpers_file.cpp @@ -1,22 +1,22 @@ ---- lib/external/pattern_language/lib/source/helpers/file.cpp.orig 2022-05-04 11:27:58 UTC +--- lib/external/pattern_language/lib/source/helpers/file.cpp.orig 2022-07-05 14:00:57 UTC +++ lib/external/pattern_language/lib/source/helpers/file.cpp -@@ -7,12 +7,12 @@ namespace pl::fs { - - File::File(const std::fs::path &path, Mode mode) noexcept : m_path(path) { - 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"); +@@ -20,12 +20,12 @@ namespace pl::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 } - File::File() noexcept { -@@ -39,7 +39,7 @@ namespace pl::fs { +@@ -53,7 +53,7 @@ namespace pl::fs { void File::seek(u64 offset) { @@ -25,7 +25,7 @@ } void File::close() { -@@ -103,10 +103,10 @@ namespace pl::fs { +@@ -138,10 +138,10 @@ namespace pl::fs { size_t File::getSize() const { if (!isValid()) return 0; @@ -40,7 +40,7 @@ if (size < 0) return 0; -@@ -117,7 +117,7 @@ namespace pl::fs { +@@ -152,7 +152,7 @@ namespace pl::fs { void File::setSize(u64 size) { if (!isValid()) return; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_libstd_string.cpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_libstd_string.cpp new file mode 100644 index 000000000000..585fca11d7d1 --- /dev/null +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_libstd_string.cpp @@ -0,0 +1,11 @@ +--- lib/external/pattern_language/lib/source/pl/libstd/string.cpp.orig 2022-07-05 14:26:01 UTC ++++ lib/external/pattern_language/lib/source/pl/libstd/string.cpp +@@ -33,7 +33,7 @@ namespace pl::libstd::string { + const auto signIndex = index >> (sizeof(index) * 8 - 1); + const auto absIndex = (index ^ signIndex) - signIndex; + #else +- const auto absIndex = std::abs(index); ++ const auto absIndex = (unsigned long)std::abs((long)index); + #endif + + if (absIndex > string.length()) diff --git a/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp b/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp index 07474a940c20..2373a25e000c 100644 --- a/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp +++ b/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp @@ -1,22 +1,22 @@ ---- lib/libimhex/source/helpers/file.cpp.orig 2022-04-17 23:53:01 UTC +--- lib/libimhex/source/helpers/file.cpp.orig 2022-07-04 19:53:18 UTC +++ lib/libimhex/source/helpers/file.cpp -@@ -5,12 +5,12 @@ namespace hex::fs { - - File::File(const std::fs::path &path, Mode mode) noexcept : m_path(path) { - 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"); +@@ -16,12 +16,12 @@ namespace hex::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 } - File::File() noexcept { -@@ -37,7 +37,7 @@ namespace hex::fs { +@@ -49,7 +49,7 @@ namespace hex::fs { void File::seek(u64 offset) { @@ -25,7 +25,7 @@ } void File::close() { -@@ -101,10 +101,10 @@ namespace hex::fs { +@@ -134,10 +134,10 @@ namespace hex::fs { size_t File::getSize() const { if (!isValid()) return 0; @@ -40,7 +40,7 @@ if (size < 0) return 0; -@@ -115,7 +115,7 @@ namespace hex::fs { +@@ -148,7 +148,7 @@ namespace hex::fs { void File::setSize(u64 size) { if (!isValid()) return; diff --git a/editors/imhex/files/patch-main_source_window_window.cpp b/editors/imhex/files/patch-main_source_window_window.cpp index a7e0a5c9c081..fea26fd85d64 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-05-28 18:14:30 UTC +--- main/source/window/window.cpp.orig 2022-07-04 19:53:18 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"); -@@ -607,7 +606,7 @@ namespace hex { +@@ -606,7 +605,7 @@ namespace hex { return; for (int i = 0; i < count; i++) { diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_pl__builtin__functions.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_pl__builtin__functions.cpp deleted file mode 100644 index b922e005ca85..000000000000 --- a/editors/imhex/files/patch-plugins_builtin_source_content_pl__builtin__functions.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/builtin/source/content/pl_builtin_functions.cpp.orig 2022-04-17 23:53:01 UTC -+++ plugins/builtin/source/content/pl_builtin_functions.cpp -@@ -203,7 +203,7 @@ namespace hex::plugin::builtin { - const auto signIndex = index >> (sizeof(index) * 8 - 1); - const auto absIndex = (index ^ signIndex) - signIndex; - #else -- const auto absIndex = std::abs(index); -+ const auto absIndex = (unsigned long)std::abs((long)index); - #endif - - if (absIndex > string.length()) 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 8f17b860c16f..ad0e3c3a69d3 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,11 +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.orig 2022-07-04 19:53:18 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)); +- return std::search(haystackBegin, haystackEnd, std::boyer_moore_horspool_searcher(needleBegin, needleEnd)); ++ return std::search(haystackBegin, haystackEnd, needleBegin, needleEnd); + }; + + if (!backwards) { diff --git a/editors/imhex/pkg-plist b/editors/imhex/pkg-plist index e319711e23c2..49778e06715f 100644 --- a/editors/imhex/pkg-plist +++ b/editors/imhex/pkg-plist @@ -1,6 +1,7 @@ bin/imhex lib/libimhex.so share/applications/imhex.desktop +%%DATADIR%%/constants/_schema.json %%DATADIR%%/constants/crc16.json %%DATADIR%%/constants/crc32.json %%DATADIR%%/constants/http_status.json