editors/imhex: Update to 1.19.2

editors/imhex/Makefile

@@ -1,5 +1,5 @@
 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
@@ -50,11 +50,11 @@ GH_TUPLE=	btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi
 
 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

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

editors/imhex/files/patch-CMakeLists.txt

@@ -1,6 +1,6 @@
---- 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()

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

editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp

@@ -1,6 +1,6 @@
---- 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;
          }
 
@@ -9,12 +9,3 @@
              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 += "[ ";

editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp

@@ -1,4 +1,4 @@
---- 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()));
@@ -9,12 +9,3 @@
              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 += " { ";

editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp

@@ -1,4 +1,4 @@
---- 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 "";
@@ -9,12 +9,3 @@
              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());
-         }
-     };

editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp

@@ -1,6 +1,6 @@
---- 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);
          }
 

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<std::string> 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<const char8_t *>(&path.front()), reinterpret_cast<const char8_t *>(std::next(&path.back())));
++            std::string_view uString(&path.front()); // This is necessary for Clang13
+             userFolders.emplace_back(uString);
+         }
+     }

editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp

@@ -1,6 +1,6 @@
---- 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) {

editors/imhex/pkg-plist

@@ -54,6 +54,7 @@ share/applications/imhex.desktop
 %%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