diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index fb638dca6d99..d823d727e532 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -1,93 +1,93 @@ PORTNAME= imhex -PORTVERSION= 1.19.1 +PORTVERSION= 1.19.2 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= c4ee726 -GH_TAG_IMHEX_PATTERNS= 48dd8f6 +GH_TAG_IMHEX_PATTERNS= f40943c GH_TAG_LIBROMFS= 58757f6 -GH_TAG_NATIVEFILEDIALOG= 28ade5a -GH_TAG_PATTERN_LANGUAGE= 9e984e0 -GH_TAG_YARA= 1367943 +GH_TAG_NATIVEFILEDIALOG= 3311592 +GH_TAG_PATTERN_LANGUAGE= 5524ad4 +GH_TAG_YARA= d5a7565 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 bbf142439992..8ccbf86c30d2 100644 --- a/editors/imhex/distinfo +++ b/editors/imhex/distinfo @@ -1,19 +1,19 @@ -TIMESTAMP = 1657211025 +TIMESTAMP = 1658074717 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec SIZE (imhex/xdg.hpp) = 7674 -SHA256 (imhex/WerWolv-ImHex-v1.19.1_GH0.tar.gz) = a9daa8dd3ec1637874689293733a2d4a121a13a53cab8a601c1589bfa0f9d0e7 -SIZE (imhex/WerWolv-ImHex-v1.19.1_GH0.tar.gz) = 10621907 -SHA256 (imhex/btzy-nativefiledialog-extended-28ade5a_GH0.tar.gz) = dcba95e4af561468fd30533882af0733a8e4df7a963c2a19eef9789c90807e28 -SIZE (imhex/btzy-nativefiledialog-extended-28ade5a_GH0.tar.gz) = 409643 +SHA256 (imhex/WerWolv-ImHex-v1.19.2_GH0.tar.gz) = 4f5e87264fc4a33c00812e0fffbb13ef5bc7d5be80db11278cdbed06f27f3b1f +SIZE (imhex/WerWolv-ImHex-v1.19.2_GH0.tar.gz) = 10622186 +SHA256 (imhex/btzy-nativefiledialog-extended-3311592_GH0.tar.gz) = 8485f3ef81f0882f357482178f29360e29a2957507b35dec7057dcf33e6f628b +SIZE (imhex/btzy-nativefiledialog-extended-3311592_GH0.tar.gz) = 411759 SHA256 (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 435d40757928fa73dec19c6d0fbf171bd76341391c8525ce1286927dab44c3e7 SIZE (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 5761632 SHA256 (imhex/fmtlib-fmt-c4ee726_GH0.tar.gz) = 05ba66b0a9ed040e5cfb07e845a0aa61fdbbb9a0cbd22a1860a303e8cbf343e4 SIZE (imhex/fmtlib-fmt-c4ee726_GH0.tar.gz) = 833672 -SHA256 (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 2afca72e2dd10a929d1341e69f1f6d170d421f04a3d6f3321bb8fb4b8982cf07 -SIZE (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 1284035 -SHA256 (imhex/WerWolv-ImHex-Patterns-48dd8f6_GH0.tar.gz) = bc4f1b6735f955b2ae691a2c13b3122a83e627c0331aea415ebea255d383f88a -SIZE (imhex/WerWolv-ImHex-Patterns-48dd8f6_GH0.tar.gz) = 322649 -SHA256 (imhex/WerWolv-PatternLanguage-9e984e0_GH0.tar.gz) = 95e2ecbac0021035b955eb082b09ac5014a9054993c3a9bb928974ce32580fd3 -SIZE (imhex/WerWolv-PatternLanguage-9e984e0_GH0.tar.gz) = 175873 +SHA256 (imhex/VirusTotal-yara-d5a7565_GH0.tar.gz) = 1c908b160f2432a25aefc1e94147949d24bcb79c1412a2be840f767531f3ff7e +SIZE (imhex/VirusTotal-yara-d5a7565_GH0.tar.gz) = 1287317 +SHA256 (imhex/WerWolv-ImHex-Patterns-f40943c_GH0.tar.gz) = b0df6d4024f4440c4a1c592535fadae8624d8a303960eabbd31836d5d20d000c +SIZE (imhex/WerWolv-ImHex-Patterns-f40943c_GH0.tar.gz) = 323448 +SHA256 (imhex/WerWolv-PatternLanguage-5524ad4_GH0.tar.gz) = 2377bcf3e03ac704b04f02002247d1cbb74fc7517f9603fe531bfd7ed286ac21 +SIZE (imhex/WerWolv-PatternLanguage-5524ad4_GH0.tar.gz) = 264643 SHA256 (imhex/WerWolv-libromfs-58757f6_GH0.tar.gz) = be53d72ac61c75cfb1b6f0cd8d961ab4a25b1cae95c43aae9a67feb0f185e3a1 SIZE (imhex/WerWolv-libromfs-58757f6_GH0.tar.gz) = 3864 diff --git a/editors/imhex/files/patch-CMakeLists.txt b/editors/imhex/files/patch-CMakeLists.txt index 573edc91cf80..84c6e2851835 100644 --- a/editors/imhex/files/patch-CMakeLists.txt +++ b/editors/imhex/files/patch-CMakeLists.txt @@ -1,10 +1,10 @@ ---- CMakeLists.txt.orig 2022-07-04 19:53:18 UTC +--- CMakeLists.txt.orig 2022-07-16 11:41:37 UTC +++ CMakeLists.txt -@@ -12,7 +12,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmak +@@ -14,7 +14,6 @@ option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF) # 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 b591abc1a075..61cc245f4922 100644 --- a/editors/imhex/files/patch-cmake_build__helpers.cmake +++ b/editors/imhex/files/patch-cmake_build__helpers.cmake @@ -1,22 +1,21 @@ ---- cmake/build_helpers.cmake.orig 2022-07-04 19:53:18 UTC +--- cmake/build_helpers.cmake.orig 2022-07-16 11:41:37 UTC +++ cmake/build_helpers.cmake -@@ -289,17 +289,9 @@ endmacro() - +@@ -291,17 +291,9 @@ endmacro() function(downloadImHexPatternsFiles dest) -- FetchContent_Declare( -- imhex_patterns -- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git -- GIT_TAG master -- ) + if (NOT IMHEX_OFFLINE_BUILD) +- FetchContent_Declare( +- imhex_patterns +- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git +- GIT_TAG master +- ) - -- FetchContent_Populate(imhex_patterns) +- 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 ${dest}) -+ install(DIRECTORY "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src/${FOLDER}" DESTINATION "share/imhex/") - endforeach() + set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic) + foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL}) +- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest}) ++ install(DIRECTORY "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src/${FOLDER}" DESTINATION "share/imhex/") + endforeach () + endif () - endfunction() -\ No newline at end of file diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__dynamic.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__dynamic.hpp deleted file mode 100644 index fa4fe8dd486d..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__dynamic.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_array_dynamic.hpp.orig 2022-07-07 16:41:14 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_array_dynamic.hpp -@@ -83,7 +83,7 @@ namespace pl { - } - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result; - - result += "[ "; 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 index cfc8d6c24f57..7e95d0fd2026 100644 --- 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 @@ -1,20 +1,11 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp.orig 2022-07-07 17:24:07 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp.orig 2022-07-17 13:30:19 UTC +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp -@@ -48,7 +48,7 @@ namespace pl { +@@ -51,7 +51,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); -@@ -119,7 +119,7 @@ namespace pl { - return this->formatDisplayValue("{ ... }", this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result; - - result += "[ "; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp index fabd5b358cc7..80d3b2fd5fbb 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp @@ -1,20 +1,11 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_bitfield.hpp.orig 2022-07-07 17:24:07 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_bitfield.hpp.orig 2022-07-17 13:32:26 UTC +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_bitfield.hpp @@ -67,7 +67,7 @@ namespace pl { return this->formatDisplayValue(fmt::format("{0} (0x{1:X})", this->getValue(), this->getValue()), u128(this->getValue())); } - [[nodiscard]] virtual std::string toString() const { + [[nodiscard]] std::string toString() const override { return fmt::format("{}", this->getValue()); } -@@ -178,7 +178,7 @@ namespace pl { - v.visit(*this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result = this->getFormattedName(); - - result += " { "; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__boolean.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__boolean.hpp deleted file mode 100644 index 3d1664011d88..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__boolean.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_boolean.hpp.orig 2022-07-07 16:47:26 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_boolean.hpp -@@ -37,7 +37,7 @@ namespace pl { - v.visit(*this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue() ? "true" : "false"); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__character.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__character.hpp deleted file mode 100644 index 921241bf0eee..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__character.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_character.hpp.orig 2022-07-07 16:48:34 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_character.hpp -@@ -34,7 +34,7 @@ namespace pl { - v.visit(*this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue()); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__enum.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__enum.hpp deleted file mode 100644 index 7d8908735ddf..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__enum.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_enum.hpp.orig 2022-07-07 16:53:35 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_enum.hpp -@@ -60,7 +60,7 @@ namespace pl { - return this->formatDisplayValue(fmt::format("{} (0x{:0{}X})", this->toString().c_str(), this->getValue(), this->getSize() * 2), this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - u64 value = this->getValue(); - - std::string valueString = this->getTypeName() + "::"; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__float.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__float.hpp deleted file mode 100644 index b2ddbfcec8e2..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__float.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_float.hpp.orig 2022-07-07 16:46:09 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_float.hpp -@@ -68,7 +68,7 @@ namespace pl { - } - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue()); - } - }; 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 index 5523fb63c22a..cbb5e501ecc4 100644 --- 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 @@ -1,20 +1,11 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp.orig 2022-07-07 17:24:07 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp.orig 2022-07-17 13:36:36 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 { }; } -@@ -30,7 +30,7 @@ namespace pl { - return ""; - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("padding[{}]", this->getSize()); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__pointer.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__pointer.hpp deleted file mode 100644 index 376b9cb21897..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__pointer.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_pointer.hpp.orig 2022-07-07 16:37:09 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_pointer.hpp -@@ -110,7 +110,7 @@ namespace pl { - return this->formatDisplayValue(fmt::format("*(0x{0:X})", data), u128(data)); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return this->m_pointedAt->toString(); - } - diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__signed.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__signed.hpp deleted file mode 100644 index 10e4c4bcdb4b..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__signed.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_signed.hpp.orig 2022-07-07 16:44:56 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_signed.hpp -@@ -49,7 +49,7 @@ namespace pl { - return this->formatDisplayValue(fmt::format("{:d} (0x{:0{}X})", data, data, 1 * 2), data); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue()); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__struct.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__struct.hpp deleted file mode 100644 index 4c71765a06ac..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__struct.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_struct.hpp.orig 2022-07-07 16:54:47 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_struct.hpp -@@ -70,7 +70,7 @@ namespace pl { - return this->m_members; - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result = this->getFormattedName(); - result += " { "; - diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__union.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__union.hpp deleted file mode 100644 index c62783c1003c..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__union.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_union.hpp.orig 2022-07-07 16:56:20 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_union.hpp -@@ -80,7 +80,7 @@ namespace pl { - } - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result = this->getFormattedName(); - result += " { "; - diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp index 00d7d96e0900..aac20ce95d81 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp @@ -1,11 +1,11 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_unsigned.hpp.orig 2022-07-07 16:43:50 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_unsigned.hpp.orig 2022-07-17 16:40:41 UTC +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_unsigned.hpp -@@ -47,7 +47,7 @@ namespace pl { +@@ -34,7 +34,7 @@ namespace pl { return this->formatDisplayValue(fmt::format("{:d} (0x{:0{}X})", data, data, 1 * 2), data); } - [[nodiscard]] virtual std::string toString() const { + [[nodiscard]] std::string toString() const override { return fmt::format("{}", this->getValue()); } }; diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp new file mode 100644 index 000000000000..75bacccf8a5e --- /dev/null +++ b/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp @@ -0,0 +1,12 @@ +--- plugins/builtin/source/content/settings_entries.cpp.orig 2022-07-16 11:41:37 UTC ++++ plugins/builtin/source/content/settings_entries.cpp +@@ -19,8 +19,7 @@ namespace { + userFolders.clear(); + std::vector paths = setting; + for (const auto &path : paths) { +- // JSON reads char8_t as array, char8_t is not supported as of now +- std::u8string_view uString(reinterpret_cast(&path.front()), reinterpret_cast(std::next(&path.back()))); ++ std::string_view uString(&path.front()); // This is necessary for Clang13 + userFolders.emplace_back(uString); + } + } 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 ad0e3c3a69d3..c928949217e6 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-07-04 19:53:18 UTC +--- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2022-07-16 11:41:37 UTC +++ plugins/builtin/source/content/views/view_hex_editor.cpp -@@ -199,7 +199,7 @@ namespace hex::plugin::builtin { +@@ -203,7 +203,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) { - 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 49778e06715f..0a9229c02eb6 100644 --- a/editors/imhex/pkg-plist +++ b/editors/imhex/pkg-plist @@ -1,61 +1,62 @@ 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/uf2.hexpat %%DATADIR%%/patterns/vdf.hexpat %%DATADIR%%/patterns/wav.hexpat %%DATADIR%%/patterns/zip.hexpat %%DATADIR%%/plugins/builtin.hexplug share/pixmaps/imhex.png