git: f9e0c9c0d0c2 - main - editors/imhex: Update to 1.19.1

From: MANTANI Nobutaka <nobutaka_at_FreeBSD.org>
Date: Thu, 07 Jul 2022 18:34:46 UTC
The branch main has been updated by nobutaka:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f9e0c9c0d0c2bca0120d3415bc252f233b351757

commit f9e0c9c0d0c2bca0120d3415bc252f233b351757
Author:     MANTANI Nobutaka <nobutaka@FreeBSD.org>
AuthorDate: 2022-07-07 18:33:19 +0000
Commit:     MANTANI Nobutaka <nobutaka@FreeBSD.org>
CommitDate: 2022-07-07 18:34:11 +0000

    editors/imhex: Update to 1.19.1
---
 editors/imhex/Makefile                               |  8 ++++----
 editors/imhex/distinfo                               | 18 +++++++++---------
 ..._external_libromfs_generator_include_embedder.hpp |  4 ++--
 ...b_include_pl_patterns_pattern__array__dynamic.hpp | 11 +++++++++++
 ...ib_include_pl_patterns_pattern__array__static.hpp | 11 ++++++++++-
 ...age_lib_include_pl_patterns_pattern__bitfield.hpp | 20 ++++++++++++++++++++
 ...uage_lib_include_pl_patterns_pattern__boolean.hpp | 11 +++++++++++
 ...ge_lib_include_pl_patterns_pattern__character.hpp | 11 +++++++++++
 ...anguage_lib_include_pl_patterns_pattern__enum.hpp | 11 +++++++++++
 ...nguage_lib_include_pl_patterns_pattern__float.hpp | 11 +++++++++++
 ...uage_lib_include_pl_patterns_pattern__padding.hpp | 11 ++++++++++-
 ...uage_lib_include_pl_patterns_pattern__pointer.hpp | 11 +++++++++++
 ...guage_lib_include_pl_patterns_pattern__signed.hpp | 11 +++++++++++
 ...guage_lib_include_pl_patterns_pattern__struct.hpp | 11 +++++++++++
 ...nguage_lib_include_pl_patterns_pattern__union.hpp | 11 +++++++++++
 ...age_lib_include_pl_patterns_pattern__unsigned.hpp | 11 +++++++++++
 .../imhex/files/patch-lib_libimhex_CMakeLists.txt    | 10 ++++++++++
 .../files/patch-lib_libimhex_source_helpers_fs.cpp   |  4 ++--
 .../imhex/files/patch-main_source_window_window.cpp  | 19 -------------------
 19 files changed, 177 insertions(+), 38 deletions(-)

diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index 96ed6d02f154..fb638dca6d99 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	imhex
-PORTVERSION=	1.19.0
+PORTVERSION=	1.19.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 MASTER_SITES=	https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg
@@ -49,11 +49,11 @@ GH_TUPLE=	btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi
 		WerWolv:libromfs:${GH_TAG_LIBROMFS}:libromfs
 
 GH_TAG_CAPSTONE=	d5141c0
-GH_TAG_FMT=	bc654fa
+GH_TAG_FMT=	c4ee726
 GH_TAG_IMHEX_PATTERNS=	48dd8f6
-GH_TAG_LIBROMFS=	1206307
+GH_TAG_LIBROMFS=	58757f6
 GH_TAG_NATIVEFILEDIALOG=	28ade5a
-GH_TAG_PATTERN_LANGUAGE=	5ab7704
+GH_TAG_PATTERN_LANGUAGE=	9e984e0
 GH_TAG_YARA=	1367943
 
 CMAKE_ARGS=	-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON
diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo
index e859e3c4ec99..bbf142439992 100644
--- a/editors/imhex/distinfo
+++ b/editors/imhex/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1657029216
+TIMESTAMP = 1657211025
 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec
 SIZE (imhex/xdg.hpp) = 7674
-SHA256 (imhex/WerWolv-ImHex-v1.19.0_GH0.tar.gz) = 28d8937d14b5d73cafcf17350dc1b1d2a26cff9c3ec36718d8922efecc3f896a
-SIZE (imhex/WerWolv-ImHex-v1.19.0_GH0.tar.gz) = 10621864
+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/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/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-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
+SHA256 (imhex/WerWolv-PatternLanguage-9e984e0_GH0.tar.gz) = 95e2ecbac0021035b955eb082b09ac5014a9054993c3a9bb928974ce32580fd3
+SIZE (imhex/WerWolv-PatternLanguage-9e984e0_GH0.tar.gz) = 175873
+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-lib_external_libromfs_generator_include_embedder.hpp b/editors/imhex/files/patch-lib_external_libromfs_generator_include_embedder.hpp
index f8ed8dac663a..3abd57283287 100644
--- a/editors/imhex/files/patch-lib_external_libromfs_generator_include_embedder.hpp
+++ b/editors/imhex/files/patch-lib_external_libromfs_generator_include_embedder.hpp
@@ -1,6 +1,6 @@
---- lib/external/libromfs/generator/include/embedder.hpp.orig	2022-05-04 11:03:08 UTC
+--- lib/external/libromfs/generator/include/embedder.hpp.orig	2022-07-07 16:28:45 UTC
 +++ lib/external/libromfs/generator/include/embedder.hpp
-@@ -19,13 +19,13 @@ R"embedder(
+@@ -20,13 +20,13 @@ R"embedder(
  
      #define RESOURCE(name, path)                        \
      __asm__ (                                           \
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
new file mode 100644
index 000000000000..fa4fe8dd486d
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__dynamic.hpp
@@ -0,0 +1,11 @@
+--- 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 a23b2f00d34b..cfc8d6c24f57 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,4 +1,4 @@
---- 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.orig	2022-07-07 17:24:07 UTC
 +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp
 @@ -48,7 +48,7 @@ namespace pl {
              return result;
@@ -9,3 +9,12 @@
              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
new file mode 100644
index 000000000000..fabd5b358cc7
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp
@@ -0,0 +1,20 @@
+--- 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
+@@ -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
new file mode 100644
index 000000000000..3d1664011d88
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__boolean.hpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..921241bf0eee
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__character.hpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..7d8908735ddf
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__enum.hpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..b2ddbfcec8e2
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__float.hpp
@@ -0,0 +1,11 @@
+--- 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 35b8c67cc7f3..5523fb63c22a 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,4 +1,4 @@
---- 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.orig	2022-07-07 17:24:07 UTC
 +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp
 @@ -16,7 +16,7 @@ namespace pl {
              return "";
@@ -9,3 +9,12 @@
              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
new file mode 100644
index 000000000000..376b9cb21897
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__pointer.hpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..10e4c4bcdb4b
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__signed.hpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..4c71765a06ac
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__struct.hpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..c62783c1003c
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__union.hpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..00d7d96e0900
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp
@@ -0,0 +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
+@@ -47,7 +47,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
new file mode 100644
index 000000000000..0199a4f5d6b6
--- /dev/null
+++ b/editors/imhex/files/patch-lib_libimhex_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- lib/libimhex/CMakeLists.txt.orig	2022-07-07 06:48:37 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)
+ 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_source_helpers_fs.cpp b/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp
index ff7069fc12c9..71ee4d7a4ff4 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-05-04 11:21:53 UTC
+--- lib/libimhex/source/helpers/fs.cpp.orig	2022-07-07 06:48:37 UTC
 +++ lib/libimhex/source/helpers/fs.cpp
-@@ -12,10 +12,15 @@
+@@ -13,10 +13,15 @@
      #include <shlobj.h>
  #elif defined(OS_LINUX)
      #include <xdg.hpp>
diff --git a/editors/imhex/files/patch-main_source_window_window.cpp b/editors/imhex/files/patch-main_source_window_window.cpp
deleted file mode 100644
index fea26fd85d64..000000000000
--- a/editors/imhex/files/patch-main_source_window_window.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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");
-@@ -606,7 +605,7 @@ namespace hex {
-                 return;
- 
-             for (int i = 0; i < count; i++) {
--                auto path = std::fs::path(reinterpret_cast<const char8_t *>(paths[i]));
-+                auto path = std::fs::path(paths[i]);
- 
-                 bool handled = false;
-                 for (const auto &[extensions, handler] : ContentRegistry::FileHandler::getEntries()) {