Update: 1.10.0

5 files changed, 18 insertions, 137 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b87289d17d92..f43a0c7acc28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = imhex
 	pkgdesc = A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM
-	pkgver = 1.9.0
-	pkgrel = 2
+	pkgver = 1.10.0
+	pkgrel = 1
 	url = https://github.com/WerWolv/ImHex
 	arch = x86_64
 	license = GPL2
@@ -21,21 +21,17 @@ pkgbase = imhex
 	depends = gtk3
 	depends = hicolor-icon-theme
 	depends = yara
-	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.9.0
-	source = 0001-warnings-fix-format-security-warnings-299.patch
-	source = 0002-Set-correct-library-names.patch
+	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.10.0
+	source = 0001-Set-correct-library-names.patch
 	source = imhex.desktop
 	cksums = SKIP
-	cksums = 403159140
-	cksums = 3838345833
+	cksums = 3656399322
 	cksums = 4178124713
 	sha256sums = SKIP
-	sha256sums = d2b254869a23144117243fd971e646c83fedfbe5b227e2050431155a127dd91f
-	sha256sums = 687ecb3b6dc4491a1e8ea91f03377801af41225cbf4263330b75630d0c485e46
+	sha256sums = a8f936c6685979f888a2008d9b407a556bd581d4655df1a88664cd35f7416d16
 	sha256sums = 72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6
 	b2sums = SKIP
-	b2sums = 7838d9d7bccf9841848913effbdc9ed692770c76bd6a5851d95d4e1a1d9c318fef5f6d05074be4b98750ce55819091cfe8f90c85751701d1fea866d1bac67b96
-	b2sums = 7b6f2a76b0009dcc784291251ae363b2733598220667aa41eb443d167d7bb94c512d503369ee61429bd4dd4d957b4988a6cbbbc74fc34909b6fe68198620ba93
+	b2sums = 6e68b4674888b1888f1e2a9afb9b894f180e6823c3bc0579ca6ddbe99cc23ba167761d9122ed411e421e50a951276c4a5f34b13cfbb04081fca217b895603284
 	b2sums = 7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc
 
 pkgname = imhex
diff --git a/0001-Arch-Linux-customisations.patch b/0001-Arch-Linux-customisations.patch
deleted file mode 100644
index 0015f3e4ebac..000000000000
--- a/0001-Arch-Linux-customisations.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0e141f2b110cfdcadc8afcead56deb7565eda91b Mon Sep 17 00:00:00 2001
-From: KokaKiwi <kokakiwi+git@kokakiwi.net>
-Date: Fri, 21 May 2021 17:59:13 +0200
-Subject: [PATCH] Arch Linux customisations.
-
----
- plugins/libimhex/include/hex/helpers/utils.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/libimhex/include/hex/helpers/utils.hpp b/plugins/libimhex/include/hex/helpers/utils.hpp
-index 5bc606f..435752a 100644
---- a/plugins/libimhex/include/hex/helpers/utils.hpp
-+++ b/plugins/libimhex/include/hex/helpers/utils.hpp
-@@ -25,7 +25,7 @@
-     #define fopen64 fopen
-     #define fseeko64 fseek
-     #define ftello64 ftell
--#else
-+#elif __cplusplus < 201703L
-     template<>
-     struct std::is_integral<u128> : public std::true_type { };
-     template<>
--- 
-2.31.1
-
diff --git a/0002-Set-correct-library-names.patch b/0001-Set-correct-library-names.patch
index 14822545c94c..261fa0b82c98 100644
--- a/0002-Set-correct-library-names.patch
+++ b/0001-Set-correct-library-names.patch
@@ -1,14 +1,14 @@
-From 957162f83b6cfa0c89d325c6bc6134127cc99a09 Mon Sep 17 00:00:00 2001
+From 8735d30e13067146ba6e1968b491b4654fdb19f7 Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
 Date: Sun, 19 Sep 2021 15:10:13 +0200
-Subject: [PATCH 2/2] Set correct library names
+Subject: [PATCH] Set correct library names
 
 ---
  CMakeLists.txt | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fa17c4..de99ca2 100644
+index 4aab3a3..5178b35 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -34,6 +34,7 @@ else()
@@ -19,7 +19,7 @@ index 3fa17c4..de99ca2 100644
  else()
      find_package(PkgConfig REQUIRED)
      pkg_check_modules(YARA REQUIRED IMPORTED_TARGET yara)
-@@ -99,9 +100,11 @@ set_target_properties(imhex PROPERTIES CXX_VISIBILITY_PRESET hidden)
+@@ -103,9 +104,11 @@ set_target_properties(imhex PROPERTIES CXX_VISIBILITY_PRESET hidden)
  target_link_directories(imhex PRIVATE ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
  
  if (WIN32)
diff --git a/0001-warnings-fix-format-security-warnings-299.patch b/0001-warnings-fix-format-security-warnings-299.patch
deleted file mode 100644
index b94a075b63df..000000000000
--- a/0001-warnings-fix-format-security-warnings-299.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From d601dfcb711b07fe2c317f64b3f245cf41a35aff Mon Sep 17 00:00:00 2001
-From: Russ <russ@rw.id.au>
-Date: Wed, 15 Sep 2021 18:02:16 +1000
-Subject: [PATCH 1/2] warnings: fix format-security warnings (#299)
-
----
- source/views/view_help.cpp           | 8 ++++----
- source/views/view_hexeditor.cpp      | 2 +-
- source/views/view_pattern_editor.cpp | 4 ++--
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/source/views/view_help.cpp b/source/views/view_help.cpp
-index 0f19b27..d33ecb5 100644
---- a/source/views/view_help.cpp
-+++ b/source/views/view_help.cpp
-@@ -17,7 +17,7 @@ namespace hex {
- 
- 
-     static void drawTitle(const std::string &title) {
--        ImGui::TextColored(ImVec4(0.6F, 0.6F, 1.0F, 1.0F), title.c_str());
-+        ImGui::TextColored(ImVec4(0.6F, 0.6F, 1.0F, 1.0F), "%s", title.c_str());
-     }
- 
-     static void drawBuiltinFunction(
-@@ -27,9 +27,9 @@ namespace hex {
-         const std::string &description
-     ) {
-         ImGui::Bullet();
--        ImGui::TextColored(ImVec4(0.3F, 0.7F, 0.2F, 1.0F), return_type.c_str());
-+        ImGui::TextColored(ImVec4(0.3F, 0.7F, 0.2F, 1.0F), "%s", return_type.c_str());
-         ImGui::SameLine();
--        ImGui::TextColored(ImVec4(0.57F, 0.24F, 0.69F, 1.0F), name.c_str());
-+        ImGui::TextColored(ImVec4(0.57F, 0.24F, 0.69F, 1.0F), "%s", name.c_str());
-         ImGui::SameLine();
-         ImGui::TextColored(ImVec4(0.71F, 0.19F, 0.31F, 1.0F), "(");
-         ImGui::SameLine();
-@@ -77,7 +77,7 @@ namespace hex {
- 
-             constexpr const char* Links[] = { "https://werwolv.net/donate", "https://www.patreon.com/werwolv", "https://github.com/sponsors/WerWolv" };
- 
--            ImGui::TextWrapped("hex.view.help.about.thanks"_lang);
-+            ImGui::TextWrapped("%s", static_cast<const char *>("hex.view.help.about.thanks"_lang));
- 
-             ImGui::NewLine();
- 
-diff --git a/source/views/view_hexeditor.cpp b/source/views/view_hexeditor.cpp
-index 9ddad85..848ed1f 100644
---- a/source/views/view_hexeditor.cpp
-+++ b/source/views/view_hexeditor.cpp
-@@ -308,7 +308,7 @@ namespace hex {
- 
-         if (ImGui::BeginPopupModal("hex.view.hexeditor.script.title"_lang, nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
-             ImGui::SetCursorPosX(10);
--            ImGui::TextWrapped("hex.view.hexeditor.script.desc"_lang);
-+            ImGui::TextWrapped("%s", static_cast<const char *>("hex.view.hexeditor.script.desc"_lang));
- 
-             ImGui::NewLine();
-             ImGui::InputText("##nolabel", this->m_loaderScriptScriptPath.data(), this->m_loaderScriptScriptPath.length(), ImGuiInputTextFlags_ReadOnly);
-diff --git a/source/views/view_pattern_editor.cpp b/source/views/view_pattern_editor.cpp
-index 3fdd231..87ffe63 100644
---- a/source/views/view_pattern_editor.cpp
-+++ b/source/views/view_pattern_editor.cpp
-@@ -268,7 +268,7 @@ namespace hex {
- 
-     void ViewPatternEditor::drawAlwaysVisible() {
-         if (ImGui::BeginPopupModal("hex.view.pattern.accept_pattern"_lang, nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
--            ImGui::TextWrapped("hex.view.pattern.accept_pattern.desc"_lang);
-+            ImGui::TextWrapped("%s", static_cast<const char *>("hex.view.pattern.accept_pattern.desc"_lang));
- 
-             std::vector<std::string> entries;
-             entries.resize(this->m_possiblePatternFiles.size());
-@@ -286,7 +286,7 @@ namespace hex {
-             }, &entries, entries.size(), 4);
- 
-             ImGui::NewLine();
--            ImGui::Text("hex.view.pattern.accept_pattern.question"_lang);
-+            ImGui::Text("%s", static_cast<const char *>("hex.view.pattern.accept_pattern.question"_lang));
- 
-             confirmButtons("hex.common.yes"_lang, "hex.common.no"_lang, [this]{
-                 this->loadPatternFile(this->m_possiblePatternFiles[this->m_selectedPatternFile]);
--- 
-2.33.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 1d96fb4a50b4..6175f83a8327 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=ImHex
 pkgname=${_pkgname,,}
-pkgver=1.9.0
-pkgrel=2
+pkgver=1.10.0
+pkgrel=1
 pkgdesc='A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM'
 url='https://github.com/WerWolv/ImHex'
 license=('GPL2')
@@ -14,28 +14,22 @@ depends=('glfw' 'capstone' 'mbedtls' 'libssh2'
          'yara')
 makedepends=('git' 'cmake' 'glm' 'llvm' 'nlohmann-json' 'librsvg')
 source=("${pkgname}::git+https://github.com/WerWolv/ImHex.git#tag=v${pkgver}"
-  0001-warnings-fix-format-security-warnings-299.patch
-  0002-Set-correct-library-names.patch
+  0001-Set-correct-library-names.patch
   imhex.desktop)
 cksums=('SKIP'
-        '403159140'
-        '3838345833'
+        '3656399322'
         '4178124713')
 sha256sums=('SKIP'
-            'd2b254869a23144117243fd971e646c83fedfbe5b227e2050431155a127dd91f'
-            '687ecb3b6dc4491a1e8ea91f03377801af41225cbf4263330b75630d0c485e46'
+            'a8f936c6685979f888a2008d9b407a556bd581d4655df1a88664cd35f7416d16'
             '72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6')
 b2sums=('SKIP'
-        '7838d9d7bccf9841848913effbdc9ed692770c76bd6a5851d95d4e1a1d9c318fef5f6d05074be4b98750ce55819091cfe8f90c85751701d1fea866d1bac67b96'
-        '7b6f2a76b0009dcc784291251ae363b2733598220667aa41eb443d167d7bb94c512d503369ee61429bd4dd4d957b4988a6cbbbc74fc34909b6fe68198620ba93'
+        '6e68b4674888b1888f1e2a9afb9b894f180e6823c3bc0579ca6ddbe99cc23ba167761d9122ed411e421e50a951276c4a5f34b13cfbb04081fca217b895603284'
         '7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc')
 
 prepare() {
   git -C "$pkgname" submodule update --init --recursive
 
-  git -C "$pkgname" apply -v \
-    "$srcdir/0001-warnings-fix-format-security-warnings-299.patch" \
-    "$srcdir/0002-Set-correct-library-names.patch"
+  git -C "$pkgname" apply -v "$srcdir"/*.patch
 }
 
 build() {
@@ -72,7 +66,6 @@ package() {
   install -Dm0644 "${pkgname}/res/icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/imhex.svg"
 
   # Misc files
-  install -Dm0644 build/magic_dbs.mgc "${pkgdir}/usr/share/imhex/magic/imhex.mgc"
   install -Dm0644 -t "${pkgdir}/usr/share/imhex/resources" "${pkgname}/res/resources"/*
 
   # License