Date: Sat, 19 Feb 2022 03:53:51 GMT From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5e644a64d681 - main - editors/imhex: Update to 1.15.0 Message-ID: <202202190353.21J3rp9N027978@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e644a64d68159373a5d71511d2aa54e387d63c8 commit 5e644a64d68159373a5d71511d2aa54e387d63c8 Author: MANTANI Nobutaka <nobutaka@FreeBSD.org> AuthorDate: 2022-02-19 03:52:42 +0000 Commit: MANTANI Nobutaka <nobutaka@FreeBSD.org> CommitDate: 2022-02-19 03:53:18 +0000 editors/imhex: Update to 1.15.0 --- editors/imhex/Makefile | 2 +- editors/imhex/distinfo | 6 +++--- editors/imhex/files/patch-CMakeLists.txt | 6 +++--- ...atch-lib_libimhex_include_hex_helpers_disassembler.hpp | 15 --------------- ...b_libimhex_include_hex_pattern__language_ast__node.hpp | 6 +++--- .../files/patch-lib_libimhex_source_helpers_file.cpp | 6 +++--- editors/imhex/files/patch-main_source_window_window.cpp | 6 +++--- ...gins_builtin_source_content_pl__builtin__functions.cpp | 6 +++--- ...ns_builtin_source_content_providers_disk__provider.cpp | 4 ++-- 9 files changed, 21 insertions(+), 36 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index ddbd893b841d..a04431fcd9dd 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -1,5 +1,5 @@ PORTNAME= imhex -PORTVERSION= 1.14.0 +PORTVERSION= 1.15.0 DISTVERSIONPREFIX= v CATEGORIES= editors MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo index 631bfe4f0c34..b1b24b0fffe0 100644 --- a/editors/imhex/distinfo +++ b/editors/imhex/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1643635079 +TIMESTAMP = 1645106596 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec SIZE (imhex/xdg.hpp) = 7674 -SHA256 (imhex/WerWolv-ImHex-v1.14.0_GH0.tar.gz) = 8f303a89c03294ab77d8c97ecaa091c397bfc15f562b9be48d301f830dcd8943 -SIZE (imhex/WerWolv-ImHex-v1.14.0_GH0.tar.gz) = 8845734 +SHA256 (imhex/WerWolv-ImHex-v1.15.0_GH0.tar.gz) = 101546a3018a073aefb5c7063a82425d4c116784d0c1673207b1c543cd8e7629 +SIZE (imhex/WerWolv-ImHex-v1.15.0_GH0.tar.gz) = 8860931 SHA256 (imhex/btzy-nativefiledialog-extended-322d1bc_GH0.tar.gz) = 1950e8870068b64f862da0dcaebabaeae9a8d0edacae80ec2208a2df9c1e360f SIZE (imhex/btzy-nativefiledialog-extended-322d1bc_GH0.tar.gz) = 400379 SHA256 (imhex/capstone-engine-capstone-c7c665f_GH0.tar.gz) = 7da2ea128eb6cf627be547da50275e8e8d6df0c184b2c8713a47eff5ae824ea7 diff --git a/editors/imhex/files/patch-CMakeLists.txt b/editors/imhex/files/patch-CMakeLists.txt index d99992725969..f8e892680e22 100644 --- a/editors/imhex/files/patch-CMakeLists.txt +++ b/editors/imhex/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2022-01-30 20:55:06 UTC +--- CMakeLists.txt.orig 2022-02-15 12:57:57 UTC +++ CMakeLists.txt -@@ -11,7 +11,6 @@ include("${CMAKE_SOURCE_DIR}/cmake/build_helpers.cmake +@@ -11,7 +11,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmak # Make sure project is configured correctly setDefaultBuiltTypeIfUnset() @@ -15,4 +15,4 @@ -add_custom_target(imhex ALL DEPENDS main) # Add unit tests - enable_testing() + add_subdirectory(tests EXCLUDE_FROM_ALL) diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_disassembler.hpp b/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_disassembler.hpp deleted file mode 100644 index 169ab8b00f34..000000000000 --- a/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_disassembler.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/libimhex/include/hex/helpers/disassembler.hpp.orig 2022-01-31 13:32:21 UTC -+++ lib/libimhex/include/hex/helpers/disassembler.hpp -@@ -1,10 +1,7 @@ - #pragma once - --#if __has_include(<capstone/capstone.h>) -- #include <capstone/capstone.h> --#else -- #include <capstone.h> --#endif -+#include <capstone.h> -+ - #include <hex.hpp> - - namespace hex { diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_pattern__language_ast__node.hpp b/editors/imhex/files/patch-lib_libimhex_include_hex_pattern__language_ast__node.hpp index 113320775de9..bfe310010fb0 100644 --- a/editors/imhex/files/patch-lib_libimhex_include_hex_pattern__language_ast__node.hpp +++ b/editors/imhex/files/patch-lib_libimhex_include_hex_pattern__language_ast__node.hpp @@ -1,6 +1,6 @@ ---- lib/libimhex/include/hex/pattern_language/ast_node.hpp.orig 2022-01-30 20:55:06 UTC +--- lib/libimhex/include/hex/pattern_language/ast_node.hpp.orig 2022-02-15 12:57:57 UTC +++ lib/libimhex/include/hex/pattern_language/ast_node.hpp -@@ -13,6 +13,8 @@ +@@ -14,6 +14,8 @@ #include <variant> #include <vector> @@ -9,7 +9,7 @@ namespace hex::pl { class PatternData; -@@ -1794,7 +1796,7 @@ namespace hex::pl { +@@ -1895,7 +1897,7 @@ namespace hex::pl { Path m_path; void readVariable(Evaluator *evaluator, auto &value, PatternData *variablePattern) const { 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 92b04fd70d6c..30bc60c741b5 100644 --- a/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp +++ b/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp @@ -1,4 +1,4 @@ ---- lib/libimhex/source/helpers/file.cpp.orig 2022-01-30 20:55:06 UTC +--- lib/libimhex/source/helpers/file.cpp.orig 2022-02-15 12:57:57 UTC +++ lib/libimhex/source/helpers/file.cpp @@ -5,12 +5,12 @@ namespace hex { @@ -25,7 +25,7 @@ } void File::close() { -@@ -95,10 +95,10 @@ namespace hex { +@@ -96,10 +96,10 @@ namespace hex { size_t File::getSize() const { if (!isValid()) return 0; @@ -40,7 +40,7 @@ return size; } -@@ -106,7 +106,7 @@ namespace hex { +@@ -107,7 +107,7 @@ namespace hex { 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 1822b8ed89ee..3fb9d7805bc2 100644 --- a/editors/imhex/files/patch-main_source_window_window.cpp +++ b/editors/imhex/files/patch-main_source_window_window.cpp @@ -1,10 +1,10 @@ ---- main/source/window/window.cpp.orig 2022-01-30 20:55:06 UTC +--- main/source/window/window.cpp.orig 2022-02-15 12:57:57 UTC +++ main/source/window/window.cpp -@@ -280,7 +280,6 @@ namespace hex { +@@ -151,7 +151,6 @@ namespace hex { std::signal(SIGSEGV, signalHandler); std::signal(SIGINT, signalHandler); std::signal(SIGILL, signalHandler); - std::signal(SIGABRT, signalHandler); std::signal(SIGFPE, signalHandler); - auto imhexLogo = romfs::get("logo.png"); + auto imhexLogo = romfs::get("logo.png"); 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 index a0c8ac4b72d5..bbef929cb471 100644 --- 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 @@ -1,8 +1,8 @@ ---- plugins/builtin/source/content/pl_builtin_functions.cpp.orig 2022-01-30 20:55:06 UTC +--- plugins/builtin/source/content/pl_builtin_functions.cpp.orig 2022-02-15 12:57:57 UTC +++ plugins/builtin/source/content/pl_builtin_functions.cpp -@@ -193,7 +193,7 @@ namespace hex::plugin::builtin { +@@ -195,7 +195,7 @@ namespace hex::plugin::builtin { const auto signIndex = index >> (sizeof(index) * 8 - 1); - const auto absIndex = (index ^ signIndex) - signIndex; + const auto absIndex = (index ^ signIndex) - signIndex; #else - const auto absIndex = std::abs(index); + const auto absIndex = std::abs((long)index); diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp index 0a94c8aeacab..c02de3ebdc20 100644 --- a/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp +++ b/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp @@ -1,6 +1,6 @@ ---- plugins/builtin/source/content/providers/disk_provider.cpp.orig 2022-01-30 20:55:06 UTC +--- plugins/builtin/source/content/providers/disk_provider.cpp.orig 2022-02-15 12:57:57 UTC +++ plugins/builtin/source/content/providers/disk_provider.cpp -@@ -11,7 +11,9 @@ +@@ -15,7 +15,9 @@ #include <sys/stat.h> #include <sys/types.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202190353.21J3rp9N027978>