Update: 1.19.2

5 files changed, 51 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94c92c4ef854..e89f0f2d494a 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.19.1
-	pkgrel = 4
+	pkgver = 1.19.2
+	pkgrel = 1
 	url = https://imhex.werwolv.net
 	arch = x86_64
 	license = GPL2
@@ -24,12 +24,12 @@ pkgbase = imhex
 	depends = yara
 	optdepends = imhex-patterns-git: ImHex base patterns
 	options = !lto
-	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.19.1
+	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.19.2
 	source = nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git
 	source = xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp
 	source = libromfs::git+https://github.com/WerWolv/libromfs
 	source = capstone::git+https://github.com/capstone-engine/capstone#branch=next
-	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.19.1
+	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.19.2
 	source = 0001-makepkg-Remove-external-stuff.patch
 	source = 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
 	source = 0003-fix-Deduplicate-resources-directories.patch
@@ -39,26 +39,26 @@ pkgbase = imhex
 	cksums = SKIP
 	cksums = SKIP
 	cksums = SKIP
-	cksums = 731658672
-	cksums = 1861503081
-	cksums = 282549246
+	cksums = 559898873
+	cksums = 540260233
+	cksums = 1832599645
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 8e39e6448d0cbdfa5baaa489e437a61f9df01ef415a5bfbe0d82061ce007f61c
-	sha256sums = e1a99abacbdfb0872de3715f392fd4ec2bcb38301d4f64c867a408423d0d2580
-	sha256sums = 615f786bfba81918e87f34974395499767358464efc4aa614c47205a48ea85f4
+	sha256sums = 244a57aff73da60f6e20f7a5086b3fea3d34bf30d39d1de247e1ab9cb631bec8
+	sha256sums = 9fee7806ded795954b8f5131d1799dc2a15011af22b44be4f83e84fe7bf02060
+	sha256sums = 255b25c94298b06b1ec725e05a3e113a533d0001dae28909b8c34fc621081b6b
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = ba7e9cdcf4296ae13fa0f23f408083af8f8bd54942e04584bf287c273a80b07b1f24809c005fe53caadfe92a0225b45e71685a1489447478bb034c0bb3b4a359
-	b2sums = 433b8759ebbaf7e0fbd57e6fc5221974d3f1921538df72117fb701c247bdaffc53f63fdc79ec4def3a09bce0a36d16e4fd5042a0a2ed91fdaae64023a34bb72b
-	b2sums = 0586e2f468846ea81718347bf0e1803d5e335cd58536a4e274b77be64a83918256d7de883ed02613926fb2a97ddbaa7a98f7c2b3c1849a5fb76fb5006821a9ff
+	b2sums = c808b3b0dd174cd1233e949aed76e34cd21f432ca1b27fb582b9da279f025384ceab38fa8af797aec422e2d0e8941476a804b7f462ddb25c0439e1b0f96ce861
+	b2sums = a7532a182bce2fc946f117d20e0da499e0cdc7ef8fe1df4ff9fa77d6c6b0bb682f669ccf5a7e18792c74bcf9998fd86b0e2043f129bde069de29f01a8f58fd12
+	b2sums = a7669b46e4e6a0da883ca556a36d37c71be5420f376a9a684a3499dfc1bb32e667fe76d4177a85f2af1d9eeafaecbe8ae57a13ce1ddff593e38bf5f097fbb4a8
 
 pkgname = imhex
diff --git a/0001-makepkg-Remove-external-stuff.patch b/0001-makepkg-Remove-external-stuff.patch
index b0d146823ae4..58442ecd8a40 100644
--- a/0001-makepkg-Remove-external-stuff.patch
+++ b/0001-makepkg-Remove-external-stuff.patch
@@ -1,18 +1,18 @@
-From 1c5b4de11fb85581501eedd32b26b8dbdbbd4e13 Mon Sep 17 00:00:00 2001
+From 9bbc271de0828bdcada005030f59023b79db4b03 Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
 Date: Thu, 3 Mar 2022 19:58:41 +0100
 Subject: [PATCH 1/3] makepkg: Remove external stuff
 
 ---
  CMakeLists.txt            |  1 -
- cmake/build_helpers.cmake | 29 -----------------------------
- 2 files changed, 30 deletions(-)
+ cmake/build_helpers.cmake | 31 -------------------------------
+ 2 files changed, 32 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cfddb106..ec738564 100644
+index 47ab66fa..7733b02c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -12,7 +12,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+@@ -14,7 +14,6 @@ option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
  
  # Make sure project is configured correctly
  setDefaultBuiltTypeIfUnset()
@@ -21,10 +21,10 @@ index cfddb106..ec738564 100644
  # List plugin names here. Project name must match folder name
  set(PLUGINS
 diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index c5954466..74e21048 100644
+index 366aba89..33552e58 100644
 --- a/cmake/build_helpers.cmake
 +++ b/cmake/build_helpers.cmake
-@@ -225,7 +225,6 @@ macro(createPackage)
+@@ -226,7 +226,6 @@ macro(createPackage)
          install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
          install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
          install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
@@ -32,7 +32,7 @@ index c5954466..74e21048 100644
      endif()
      
      if (CREATE_BUNDLE)
-@@ -275,31 +274,3 @@ macro(setDefaultBuiltTypeIfUnset)
+@@ -276,33 +275,3 @@ macro(setDefaultBuiltTypeIfUnset)
          set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
      endif()
  endmacro()
@@ -50,21 +50,23 @@ index c5954466..74e21048 100644
 -
 -
 -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})
--    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})
+-        endforeach ()
+-    endif ()
 -
 -endfunction()
 \ No newline at end of file
 -- 
-2.37.0
+2.37.1
 
diff --git a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
index a15e70a6b608..430b36ee3bd3 100644
--- a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
+++ b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
@@ -1,4 +1,4 @@
-From 7f036406ff4eb5b521c71eee58c1e7717a6191b2 Mon Sep 17 00:00:00 2001
+From 55d0ae1c4375c4f92f8cccc56fdb2011e06868ad Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
 Date: Mon, 31 Jan 2022 20:20:40 +0100
 Subject: [PATCH 2/3] archlinux-compat: Remove unused mbedTLS code from libcurl
@@ -67,5 +67,5 @@ index 5793b57f..f89caca4 100644
 \ No newline at end of file
 +}
 -- 
-2.37.0
+2.37.1
 
diff --git a/0003-fix-Deduplicate-resources-directories.patch b/0003-fix-Deduplicate-resources-directories.patch
index 5c6ba2560b02..b1a053446d1c 100644
--- a/0003-fix-Deduplicate-resources-directories.patch
+++ b/0003-fix-Deduplicate-resources-directories.patch
@@ -1,4 +1,4 @@
-From 868c2dd6f7c7fe50c240277ea5cb2acde43ede4a Mon Sep 17 00:00:00 2001
+From 33505ec80d294b531baf9f83e5f2d7fdc6eb4218 Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
 Date: Sat, 11 Jun 2022 23:08:31 +0200
 Subject: [PATCH 3/3] fix: Deduplicate resources directories
@@ -32,7 +32,7 @@ index 5f4e29af..26ff62df 100644
      std::string combineStrings(const std::vector<std::string> &strings, const std::string &delimiter = "");
  
 diff --git a/lib/libimhex/source/helpers/fs.cpp b/lib/libimhex/source/helpers/fs.cpp
-index b756769b..c50c6de5 100644
+index 6fa817aa..a2e1263e 100644
 --- a/lib/libimhex/source/helpers/fs.cpp
 +++ b/lib/libimhex/source/helpers/fs.cpp
 @@ -1,4 +1,5 @@
@@ -41,7 +41,7 @@ index b756769b..c50c6de5 100644
  
  #include <hex/api/content_registry.hpp>
  #include <hex/helpers/fs_macos.hpp>
-@@ -266,6 +267,9 @@ namespace hex::fs {
+@@ -256,6 +257,9 @@ namespace hex::fs {
          if (exePath && !exePath->empty())
              dataDirs.push_back(exePath->parent_path());
  
@@ -52,5 +52,5 @@ index b756769b..c50c6de5 100644
              case ImHexPath::Patterns:
                  addUserDirs(dataDirs);
 -- 
-2.37.0
+2.37.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 45ddc36692fb..ea5cdd6a2fb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=ImHex
 pkgname=${_pkgname,,}
-pkgver=1.19.1
-pkgrel=4
+pkgver=1.19.2
+pkgrel=1
 pkgdesc='A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM'
 url='https://imhex.werwolv.net'
 license=('GPL2')
@@ -31,27 +31,27 @@ cksums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        '731658672'
-        '1861503081'
-        '282549246')
+        '559898873'
+        '540260233'
+        '1832599645')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '8e39e6448d0cbdfa5baaa489e437a61f9df01ef415a5bfbe0d82061ce007f61c'
-            'e1a99abacbdfb0872de3715f392fd4ec2bcb38301d4f64c867a408423d0d2580'
-            '615f786bfba81918e87f34974395499767358464efc4aa614c47205a48ea85f4')
+            '244a57aff73da60f6e20f7a5086b3fea3d34bf30d39d1de247e1ab9cb631bec8'
+            '9fee7806ded795954b8f5131d1799dc2a15011af22b44be4f83e84fe7bf02060'
+            '255b25c94298b06b1ec725e05a3e113a533d0001dae28909b8c34fc621081b6b')
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        'ba7e9cdcf4296ae13fa0f23f408083af8f8bd54942e04584bf287c273a80b07b1f24809c005fe53caadfe92a0225b45e71685a1489447478bb034c0bb3b4a359'
-        '433b8759ebbaf7e0fbd57e6fc5221974d3f1921538df72117fb701c247bdaffc53f63fdc79ec4def3a09bce0a36d16e4fd5042a0a2ed91fdaae64023a34bb72b'
-        '0586e2f468846ea81718347bf0e1803d5e335cd58536a4e274b77be64a83918256d7de883ed02613926fb2a97ddbaa7a98f7c2b3c1849a5fb76fb5006821a9ff')
+        'c808b3b0dd174cd1233e949aed76e34cd21f432ca1b27fb582b9da279f025384ceab38fa8af797aec422e2d0e8941476a804b7f462ddb25c0439e1b0f96ce861'
+        'a7532a182bce2fc946f117d20e0da499e0cdc7ef8fe1df4ff9fa77d6c6b0bb682f669ccf5a7e18792c74bcf9998fd86b0e2043f129bde069de29f01a8f58fd12'
+        'a7669b46e4e6a0da883ca556a36d37c71be5420f376a9a684a3499dfc1bb32e667fe76d4177a85f2af1d9eeafaecbe8ae57a13ce1ddff593e38bf5f097fbb4a8')
 options=(!lto)
 
 prepare() {