diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index c83216f6a012..96ed6d02f154 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -1,93 +1,93 @@ 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 DISTFILES= xdg.hpp:xdg DIST_SUBDIR= imhex MAINTAINER= nobutaka@FreeBSD.org COMMENT= Hex editor for reverse engineers and programmers LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= i386 powerpc NOT_FOR_ARCHS_REASON= __uint128_t and __int128_t are not supported EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ btzy-nativefiledialog-extended-${GH_TAG_NATIVEFILEDIALOG}_GH0${EXTRACT_SUFX} \ capstone-engine-capstone-${GH_TAG_CAPSTONE}_GH0${EXTRACT_SUFX} \ fmtlib-fmt-${GH_TAG_FMT}_GH0${EXTRACT_SUFX} \ VirusTotal-yara-${GH_TAG_YARA}_GH0${EXTRACT_SUFX} \ WerWolv-libromfs-${GH_TAG_LIBROMFS}_GH0${EXTRACT_SUFX} \ WerWolv-ImHex-Patterns-${GH_TAG_IMHEX_PATTERNS}_GH0${EXTRACT_SUFX} \ WerWolv-PatternLanguage-${GH_TAG_PATTERN_LANGUAGE}_GH0${EXTRACT_SUFX} BUILD_DEPENDS= glm>0:math/glm \ nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libglfw.so:graphics/glfw \ libharfbuzz.so:print/harfbuzz \ libmbedtls.so:security/mbedtls \ libtre.so:textproc/libtre USES= cmake gl gnome pkgconfig python:3.8+ xorg USE_GL= gl USE_GNOME= cairo gdkpixbuf2 gtk30 USE_XORG= x11 xcb xau xdmcp USE_GITHUB= yes GH_ACCOUNT= WerWolv GH_PROJECT= ImHex GH_TUPLE= btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledialog \ capstone-engine:capstone:${GH_TAG_CAPSTONE}:capstone \ fmtlib:fmt:${GH_TAG_FMT}:fmt \ VirusTotal:yara:${GH_TAG_YARA}:yara \ WerWolv:ImHex-Patterns:${GH_TAG_IMHEX_PATTERNS}:imhex_patterns \ WerWolv:PatternLanguage:${GH_TAG_PATTERN_LANGUAGE}:pattern_language \ WerWolv:libromfs:${GH_TAG_LIBROMFS}:libromfs 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 CXXFLAGS+= -fPIC PORTDOCS= README.md OPTIONS_DEFINE= DOCS NLS NLS_USES= gettext .include OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # Before LLVM13 import to the base system .if (${OSMAJOR} == 12 && ${OSVERSION} < 1203505) \ || (${OSMAJOR} == 13 && ${OSVERSION} < 1300523) \ || (${OSMAJOR} == 14 && ${OSVERSION} < 1400042) IGNORE= will not build due to C++20 API functions unavailable in old libc++ .endif post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/xdg.hpp ${WRKSRC}/lib/external/xdgpp ${CP} -R ${WRKSRC_capstone}/* ${WRKSRC}/lib/external/capstone ${CP} -R ${WRKSRC_fmt}/* ${WRKSRC}/lib/external/fmt ${CP} -R ${WRKSRC_libromfs}/* ${WRKSRC}/lib/external/libromfs ${CP} -R ${WRKSRC_nativefiledialog}/* ${WRKSRC}/lib/external/nativefiledialog ${CP} -R ${WRKSRC_pattern_language}/* ${WRKSRC}/lib/external/pattern_language ${CP} -R ${WRKSRC_yara}/* ${WRKSRC}/lib/external/yara/yara ${MKDIR} ${WRKDIR}/.build/_deps/imhex_patterns_src ${CP} -R ${WRKSRC_imhex_patterns}/* ${WRKDIR}/.build/_deps/imhex_patterns_src post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo index cebe4816dbc1..e859e3c4ec99 100644 --- a/editors/imhex/distinfo +++ b/editors/imhex/distinfo @@ -1,19 +1,19 @@ -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 SIZE (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 5761632 SHA256 (imhex/fmtlib-fmt-bc654fa_GH0.tar.gz) = 90d5bbae46999d81510e671b49a356cd98a086ba8b7547f5065faa74f32fffad 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,10 +1,10 @@ ---- 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() -detectBadClone() # List plugin names here. Project name must match folder name set(PLUGINS 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,22 +1,22 @@ ---- 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 - GIT_TAG master - ) - - FetchContent_Populate(imhex_patterns) - 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() endfunction() \ No newline at end of file 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,51 +1,51 @@ ---- 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) { - fseeko64(this->m_file, offset, SEEK_SET); + fseeko(this->m_file, offset, SEEK_SET); } 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; - auto startPos = ftello64(this->m_file); - fseeko64(this->m_file, 0, SEEK_END); - auto size = ftello64(this->m_file); - fseeko64(this->m_file, startPos, SEEK_SET); + auto startPos = ftello(this->m_file); + fseeko(this->m_file, 0, SEEK_END); + auto size = ftello(this->m_file); + fseeko(this->m_file, startPos, SEEK_SET); 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; - auto result = ftruncate64(fileno(this->m_file), size); + auto result = ftruncate(fileno(this->m_file), size); pl::unused(result); } 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,51 +1,51 @@ ---- 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) { - fseeko64(this->m_file, offset, SEEK_SET); + fseeko(this->m_file, offset, SEEK_SET); } 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; - auto startPos = ftello64(this->m_file); - fseeko64(this->m_file, 0, SEEK_END); - auto size = ftello64(this->m_file); - fseeko64(this->m_file, startPos, SEEK_SET); + auto startPos = ftello(this->m_file); + fseeko(this->m_file, 0, SEEK_END); + auto size = ftello(this->m_file); + fseeko(this->m_file, startPos, SEEK_SET); 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; - auto result = ftruncate64(fileno(this->m_file), size); + auto result = ftruncate(fileno(this->m_file), size); hex::unused(result); } 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,19 +1,19 @@ ---- 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); std::signal(SIGINT, signalHandler); std::signal(SIGILL, signalHandler); - std::signal(SIGABRT, signalHandler); 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++) { - auto path = std::fs::path(reinterpret_cast(paths[i])); + auto path = std::fs::path(paths[i]); bool handled = false; for (const auto &[extensions, handler] : ContentRegistry::FileHandler::getEntries()) { 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,60 +1,61 @@ 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 %%DATADIR%%/constants/linux_errors.json %%DATADIR%%/encodings/ansi.tbl %%DATADIR%%/encodings/euc_jp.tbl %%DATADIR%%/encodings/iso_646.tbl %%DATADIR%%/encodings/iso_6937.tbl %%DATADIR%%/encodings/jis_x_0201.tbl %%DATADIR%%/encodings/jis_x_0211.tbl %%DATADIR%%/encodings/jis_x_0213.tbl %%DATADIR%%/encodings/shiftjis.tbl %%DATADIR%%/encodings/shiftjis_halfchars.tbl %%DATADIR%%/includes/cstdint.pat %%DATADIR%%/includes/std/bit.pat %%DATADIR%%/includes/std/cint.pat %%DATADIR%%/includes/std/ctype.pat %%DATADIR%%/includes/std/file.pat %%DATADIR%%/includes/std/fxpt.pat %%DATADIR%%/includes/std/hash.pat %%DATADIR%%/includes/std/http.pat %%DATADIR%%/includes/std/io.pat %%DATADIR%%/includes/std/limits.pat %%DATADIR%%/includes/std/math.pat %%DATADIR%%/includes/std/mem.pat %%DATADIR%%/includes/std/ptr.pat %%DATADIR%%/includes/std/rustint.pat %%DATADIR%%/includes/std/string.pat %%DATADIR%%/includes/std/sys.pat %%DATADIR%%/includes/std/types.pat %%DATADIR%%/magic/nintendo_switch_magic %%DATADIR%%/magic/portable_executable_magic %%DATADIR%%/patterns/afe2.hexpat %%DATADIR%%/patterns/ar.hexpat %%DATADIR%%/patterns/arm_cm_vtor.hexpat %%DATADIR%%/patterns/bmp.hexpat %%DATADIR%%/patterns/dds.hexpat %%DATADIR%%/patterns/elf.hexpat %%DATADIR%%/patterns/ico.hexpat %%DATADIR%%/patterns/intel_hex.hexpat %%DATADIR%%/patterns/ip.hexpat %%DATADIR%%/patterns/iso.hexpat %%DATADIR%%/patterns/java_class.hexpat %%DATADIR%%/patterns/midi.hexpat %%DATADIR%%/patterns/nacp.hexpat %%DATADIR%%/patterns/nro.hexpat %%DATADIR%%/patterns/pcap.hexpat %%DATADIR%%/patterns/pe.hexpat %%DATADIR%%/patterns/png.hexpat %%DATADIR%%/patterns/prodinfo.hexpat %%DATADIR%%/patterns/spirv.hexpat %%DATADIR%%/patterns/tga.hexpat %%DATADIR%%/patterns/vdf.hexpat %%DATADIR%%/patterns/wav.hexpat %%DATADIR%%/patterns/zip.hexpat %%DATADIR%%/plugins/builtin.hexplug share/pixmaps/imhex.png