editors/imhex: Update to 1.20.0

14 files changed, 101 insertions, 77 deletions

diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index 204dfc6a66c1..4c6d8ef7284d 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	imhex
-PORTVERSION=	1.19.3
+PORTVERSION=	1.20.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 MASTER_SITES=	https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg
@@ -50,13 +50,13 @@ GH_TUPLE=	btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi
 
 GH_TAG_CAPSTONE=	d5141c0
 GH_TAG_FMT=	c4ee726
-GH_TAG_IMHEX_PATTERNS=	f40943c
+GH_TAG_IMHEX_PATTERNS=	eda13b2
 GH_TAG_LIBROMFS=	58757f6
 GH_TAG_NATIVEFILEDIALOG=	3311592
-GH_TAG_PATTERN_LANGUAGE=	1b0de5e
+GH_TAG_PATTERN_LANGUAGE=	a8c4479
 GH_TAG_YARA=	d5a7565
 
-CMAKE_ARGS=	-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON
+CMAKE_ARGS=	-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_STRIP_RELEASE=OFF -DIMHEX_PLUGINS_IN_SHARE=ON
 CXXFLAGS+=	-fPIC
 
 PORTDOCS=	README.md
diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo
index e0f6a947a91c..ae7979966eaf 100644
--- a/editors/imhex/distinfo
+++ b/editors/imhex/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1658850000
+TIMESTAMP = 1659725742
 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec
 SIZE (imhex/xdg.hpp) = 7674
-SHA256 (imhex/WerWolv-ImHex-v1.19.3_GH0.tar.gz) = fe196a2075b2849a61b4dd566fa5d3a3089a65c107a9f356267c46e94983ba36
-SIZE (imhex/WerWolv-ImHex-v1.19.3_GH0.tar.gz) = 10622398
+SHA256 (imhex/WerWolv-ImHex-v1.20.0_GH0.tar.gz) = 10cd0a696b7de825e2151ae88082c1e9ce8d1ad44aa4fbb9421025c44598beca
+SIZE (imhex/WerWolv-ImHex-v1.20.0_GH0.tar.gz) = 10654355
 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
@@ -11,9 +11,9 @@ SHA256 (imhex/fmtlib-fmt-c4ee726_GH0.tar.gz) = 05ba66b0a9ed040e5cfb07e845a0aa61f
 SIZE (imhex/fmtlib-fmt-c4ee726_GH0.tar.gz) = 833672
 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-1b0de5e_GH0.tar.gz) = ece922828b7798529badc88e61caae1ab1a6e824c1347596d73498148a348a69
-SIZE (imhex/WerWolv-PatternLanguage-1b0de5e_GH0.tar.gz) = 265064
+SHA256 (imhex/WerWolv-ImHex-Patterns-eda13b2_GH0.tar.gz) = 4f7d3c39592c2cc53b1ded6e077b053a1c1a8017ba8b0902197fac65298c40ae
+SIZE (imhex/WerWolv-ImHex-Patterns-eda13b2_GH0.tar.gz) = 4666034
+SHA256 (imhex/WerWolv-PatternLanguage-a8c4479_GH0.tar.gz) = a1afee4cb170377296f7d8e4b123e3009cd0054bdb1f52d8011dd297e1afcb60
+SIZE (imhex/WerWolv-PatternLanguage-a8c4479_GH0.tar.gz) = 269760
 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 ac388c1a6235..01f5b9277ce1 100644
--- a/editors/imhex/files/patch-CMakeLists.txt
+++ b/editors/imhex/files/patch-CMakeLists.txt
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig	2022-07-26 14:13:07 UTC
+--- CMakeLists.txt.orig	2022-08-05 10:52:34 UTC
 +++ CMakeLists.txt
-@@ -15,7 +15,6 @@ option(IMHEX_PATTERNS_PULL_MASTER "Download latest fil
+@@ -21,8 +21,6 @@ project(imhex VERSION ${IMHEX_VERSION})
  
  # Make sure project is configured correctly
  setDefaultBuiltTypeIfUnset()
 -detectBadClone()
+-verifyCompiler()
  
  # 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 8044a67043e1..0d0d1a798f82 100644
--- a/editors/imhex/files/patch-cmake_build__helpers.cmake
+++ b/editors/imhex/files/patch-cmake_build__helpers.cmake
@@ -1,6 +1,6 @@
---- cmake/build_helpers.cmake.orig	2022-07-26 14:13:07 UTC
+--- cmake/build_helpers.cmake.orig	2022-08-05 10:52:34 UTC
 +++ cmake/build_helpers.cmake
-@@ -297,17 +297,9 @@ function(downloadImHexPatternsFiles dest)
+@@ -352,17 +352,9 @@ function(downloadImHexPatternsFiles dest)
              set(PATTERNS_BRANCH ImHex-v${IMHEX_VERSION})
          endif ()
  
@@ -19,3 +19,11 @@
          endforeach ()
      endif ()
  
+@@ -370,7 +362,6 @@ endfunction()
+ 
+ macro(setupCompilerWarnings target)
+     set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Werror")
+-    set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread")
+ 
+     set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS}    ${IMHEX_C_FLAGS}")
+     set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS}  ${IMHEX_C_FLAGS}")
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
deleted file mode 100644
index 7e95d0fd2026..000000000000
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-@@ -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);
- 
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
deleted file mode 100644
index 80d3b2fd5fbb..000000000000
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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());
-         }
- 
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
deleted file mode 100644
index cbb5e501ecc4..000000000000
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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<std::pair<u64, Pattern*>> getChildren() {
-+        [[nodiscard]] std::vector<std::pair<u64, Pattern*>> getChildren() override {
-             return { };
-         }
- 
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
deleted file mode 100644
index aac20ce95d81..000000000000
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-@@ -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-lib_libimhex_CMakeLists.txt b/editors/imhex/files/patch-lib_libimhex_CMakeLists.txt
index 0199a4f5d6b6..1aa13a5835d3 100644
--- a/editors/imhex/files/patch-lib_libimhex_CMakeLists.txt
+++ b/editors/imhex/files/patch-lib_libimhex_CMakeLists.txt
@@ -1,10 +1,10 @@
---- lib/libimhex/CMakeLists.txt.orig	2022-07-07 06:48:37 UTC
+--- lib/libimhex/CMakeLists.txt.orig	2022-08-05 10:52:34 UTC
 +++ lib/libimhex/CMakeLists.txt
 @@ -10,7 +10,6 @@ set_target_properties(imgui PROPERTIES POSITION_INDEPE
  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/microtar ${CMAKE_CURRENT_BINARY_DIR}/external/microtar EXCLUDE_FROM_ALL)
  set_target_properties(microtar PROPERTIES POSITION_INDEPENDENT_CODE ON)
  
 -set(NFD_PORTAL ON CACHE BOOL "Use Portals for Linux file dialogs" FORCE)
+ set(NFD_USE_ALLOWEDCONTENTTYPES OFF CACHE BOOL "Disable allowedContentTypes for macOS file dialogs" FORCE)
  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/nativefiledialog ${CMAKE_CURRENT_BINARY_DIR}/external/nativefiledialog EXCLUDE_FROM_ALL)
  set_target_properties(nfd PROPERTIES POSITION_INDEPENDENT_CODE ON)
- 
diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_socket.hpp b/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_socket.hpp
deleted file mode 100644
index 4072ebba628e..000000000000
--- a/editors/imhex/files/patch-lib_libimhex_include_hex_helpers_socket.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/libimhex/include/hex/helpers/socket.hpp.orig	2021-12-16 17:57:41 UTC
-+++ lib/libimhex/include/hex/helpers/socket.hpp
-@@ -14,6 +14,7 @@
- #else
-     #include <unistd.h>
-     #include <sys/socket.h>
-+    #include <netinet/in.h>
-     #include <netinet/ip.h>
-     #include <arpa/inet.h>
- 
diff --git a/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp b/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp
index 71ee4d7a4ff4..9a0b4d5bab60 100644
--- a/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp
+++ b/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp
@@ -1,6 +1,6 @@
---- lib/libimhex/source/helpers/fs.cpp.orig	2022-07-07 06:48:37 UTC
+--- lib/libimhex/source/helpers/fs.cpp.orig	2022-08-05 10:52:34 UTC
 +++ lib/libimhex/source/helpers/fs.cpp
-@@ -13,10 +13,15 @@
+@@ -14,10 +14,15 @@
      #include <shlobj.h>
  #elif defined(OS_LINUX)
      #include <xdg.hpp>
@@ -16,3 +16,12 @@
  #include <filesystem>
  
  namespace hex::fs {
+@@ -179,7 +184,7 @@ namespace hex::fs {
+         #endif
+     }
+ 
+-    constexpr std::vector<std::fs::path> appendPath(std::vector<std::fs::path> paths, const std::fs::path &folder) {
++    std::vector<std::fs::path> appendPath(std::vector<std::fs::path> paths, const std::fs::path &folder) {
+         for (auto &path : paths)
+             path = path / folder;
+ 
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_data__inspector.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_data__inspector.cpp
new file mode 100644
index 000000000000..0516ec735415
--- /dev/null
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_data__inspector.cpp
@@ -0,0 +1,20 @@
+--- plugins/builtin/source/content/data_inspector.cpp.orig	2022-08-05 19:30:19 UTC
++++ plugins/builtin/source/content/data_inspector.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         auto number   = hex::signExtend(Size * 8, hex::changeEndianess(value, Size, endian));
+         bool negative = number < 0;
+ 
+-        return hex::format(format, negative ? "-" : "", std::abs(number));
++        return hex::format(format, negative ? "-" : "", std::abs((long)number));
+     }
+ 
+     template<std::integral T, size_t Size = sizeof(T)>
+@@ -282,7 +282,7 @@ namespace hex::plugin::builtin {
+ 
+                 auto number   = hex::crypt::decodeSleb128(buffer);
+                 bool negative = number < 0;
+-                auto value    = hex::format(format, negative ? "-" : "", std::abs(number));
++                auto value    = hex::format(format, negative ? "-" : "", std::abs((long)number));
+ 
+                 return [value] { ImGui::TextUnformatted(value.c_str()); return value; };
+             },
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__find.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__find.cpp
new file mode 100644
index 000000000000..1d4e2b2cf385
--- /dev/null
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__find.cpp
@@ -0,0 +1,11 @@
+--- plugins/builtin/source/content/views/view_find.cpp.orig	2022-08-05 19:36:42 UTC
++++ plugins/builtin/source/content/views/view_find.cpp
+@@ -247,7 +247,7 @@ namespace hex::plugin::builtin {
+         auto sequence = hex::decodeByteString(settings.sequence);
+         auto occurrence = reader.begin();
+         while (true) {
+-            occurrence = std::search(reader.begin(), reader.end(), std::boyer_moore_horspool_searcher(sequence.begin(), sequence.end()));
++            occurrence = std::search(reader.begin(), reader.end(), sequence.begin(), sequence.end());
+             if (occurrence == reader.end())
+                 break;
+ 
diff --git a/editors/imhex/pkg-plist b/editors/imhex/pkg-plist
index 0a9229c02eb6..4e07839b195f 100644
--- a/editors/imhex/pkg-plist
+++ b/editors/imhex/pkg-plist
@@ -1,20 +1,42 @@
 bin/imhex
-lib/libimhex.so
+lib/libimhex.so.1.20.0
 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/arabic_iso.tbl
+%%DATADIR%%/encodings/arabic_windows.tbl
+%%DATADIR%%/encodings/ascii.tbl
+%%DATADIR%%/encodings/ascii_ansi.tbl
+%%DATADIR%%/encodings/ascii_oem.tbl
+%%DATADIR%%/encodings/baltic_iso.tbl
+%%DATADIR%%/encodings/baltic_windows.tbl
+%%DATADIR%%/encodings/cyrillic_iso.tbl
+%%DATADIR%%/encodings/cyrillic_koi8_r.tbl
+%%DATADIR%%/encodings/cyrillic_koi8_u.tbl
+%%DATADIR%%/encodings/cyrillic_windows.tbl
+%%DATADIR%%/encodings/eastern_europe_iso.tbl
+%%DATADIR%%/encodings/eastern_europe_windows.tbl
+%%DATADIR%%/encodings/ebcdic.tbl
 %%DATADIR%%/encodings/euc_jp.tbl
+%%DATADIR%%/encodings/greek_iso.tbl
+%%DATADIR%%/encodings/greek_windows.tbl
+%%DATADIR%%/encodings/hebrew_iso.tbl
+%%DATADIR%%/encodings/hebrew_windows.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/macintosh.tbl
 %%DATADIR%%/encodings/shiftjis.tbl
-%%DATADIR%%/encodings/shiftjis_halfchars.tbl
+%%DATADIR%%/encodings/thai.tbl
+%%DATADIR%%/encodings/turkish_iso.tbl
+%%DATADIR%%/encodings/turkish_windows.tbl
+%%DATADIR%%/encodings/utf8.tbl
+%%DATADIR%%/encodings/vietnamese.tbl
 %%DATADIR%%/includes/cstdint.pat
 %%DATADIR%%/includes/std/bit.pat
 %%DATADIR%%/includes/std/cint.pat
@@ -31,7 +53,14 @@ share/applications/imhex.desktop
 %%DATADIR%%/includes/std/rustint.pat
 %%DATADIR%%/includes/std/string.pat
 %%DATADIR%%/includes/std/sys.pat
-%%DATADIR%%/includes/std/types.pat
+%%DATADIR%%/includes/std/time.pat
+%%DATADIR%%/includes/type/byte.pat
+%%DATADIR%%/includes/type/float16.pat
+%%DATADIR%%/includes/type/guid.pat
+%%DATADIR%%/includes/type/ip.pat
+%%DATADIR%%/includes/type/leb128.pat
+%%DATADIR%%/includes/type/mac.pat
+%%DATADIR%%/includes/type/time.pat
 %%DATADIR%%/magic/nintendo_switch_magic
 %%DATADIR%%/magic/portable_executable_magic
 %%DATADIR%%/patterns/afe2.hexpat