Update: 1.19.3

5 files changed, 43 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e89f0f2d494a..58343488d9ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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.2
+	pkgver = 1.19.3
 	pkgrel = 1
 	url = https://imhex.werwolv.net
 	arch = x86_64
@@ -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.2
+	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.19.3
 	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.2
+	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.19.3
 	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 = 559898873
-	cksums = 540260233
-	cksums = 1832599645
+	cksums = 352208527
+	cksums = 2380891546
+	cksums = 187806777
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 244a57aff73da60f6e20f7a5086b3fea3d34bf30d39d1de247e1ab9cb631bec8
-	sha256sums = 9fee7806ded795954b8f5131d1799dc2a15011af22b44be4f83e84fe7bf02060
-	sha256sums = 255b25c94298b06b1ec725e05a3e113a533d0001dae28909b8c34fc621081b6b
+	sha256sums = f38410d3b7fbf61cab51d9258c2f554fe04cfa59962bfb1ffa2086970a56bf02
+	sha256sums = a5fc4f0a7a7fa7465ba9ed29e1b49cf0d9cdc0477be93628768d0566309c909b
+	sha256sums = 44f737ed46d529e860084975c2a2a50e439b0baabf41205c2cbe50263b9621d3
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = c808b3b0dd174cd1233e949aed76e34cd21f432ca1b27fb582b9da279f025384ceab38fa8af797aec422e2d0e8941476a804b7f462ddb25c0439e1b0f96ce861
-	b2sums = a7532a182bce2fc946f117d20e0da499e0cdc7ef8fe1df4ff9fa77d6c6b0bb682f669ccf5a7e18792c74bcf9998fd86b0e2043f129bde069de29f01a8f58fd12
-	b2sums = a7669b46e4e6a0da883ca556a36d37c71be5420f376a9a684a3499dfc1bb32e667fe76d4177a85f2af1d9eeafaecbe8ae57a13ce1ddff593e38bf5f097fbb4a8
+	b2sums = a0e733be3d9373f572992effa943e4da3d88d35bd634daea1617adb63ff22ef3c07b919671c7ac1a6761e67bc9a703e77882f7bbf947c3271afe36512c8d1c99
+	b2sums = 39f71cc1c09f8d0b5eb70952b017aa0e57907c4dba8cc071fcc1b03b1ba95aed080db6c8de44ac59e92cbf22c58afcaeded424603ddad0e2af0495a7f5bcc38e
+	b2sums = 085b99b69d98256eb0078fe86b62921a1e0a9328e9992805e298a6de9a16d99d33fe0bf239711e1ca27c65cc29d6f733fac3dadc9d914860f128c697bd5e6f22
 
 pkgname = imhex
diff --git a/0001-makepkg-Remove-external-stuff.patch b/0001-makepkg-Remove-external-stuff.patch
index 58442ecd8a40..e6aa0bead52b 100644
--- a/0001-makepkg-Remove-external-stuff.patch
+++ b/0001-makepkg-Remove-external-stuff.patch
@@ -1,18 +1,18 @@
-From 9bbc271de0828bdcada005030f59023b79db4b03 Mon Sep 17 00:00:00 2001
+From 19da13e41a4cc5cdd0d28ed22f8ca0083b01ffd0 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 | 31 -------------------------------
- 2 files changed, 32 deletions(-)
+ cmake/build_helpers.cmake | 39 +--------------------------------------
+ 2 files changed, 1 insertion(+), 39 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47ab66fa..7733b02c 100644
+index 7cba0c6b..b4088cae 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -14,7 +14,6 @@ option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
+@@ -15,7 +15,6 @@ option(IMHEX_PATTERNS_PULL_MASTER "Download latest files from master branch of t
  
  # Make sure project is configured correctly
  setDefaultBuiltTypeIfUnset()
@@ -21,18 +21,21 @@ index 47ab66fa..7733b02c 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 366aba89..33552e58 100644
+index 8a40a609..5aff088f 100644
 --- a/cmake/build_helpers.cmake
 +++ b/cmake/build_helpers.cmake
-@@ -226,7 +226,6 @@ macro(createPackage)
+@@ -226,9 +226,8 @@ 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}")
 -        downloadImHexPatternsFiles("./share/imhex")
      endif()
-     
+-    
++
      if (CREATE_BUNDLE)
-@@ -276,33 +275,3 @@ macro(setDefaultBuiltTypeIfUnset)
+         include(PostprocessBundle)
+ 
+@@ -276,39 +275,3 @@ macro(setDefaultBuiltTypeIfUnset)
          set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
      endif()
  endmacro()
@@ -51,6 +54,12 @@ index 366aba89..33552e58 100644
 -
 -function(downloadImHexPatternsFiles dest)
 -    if (NOT IMHEX_OFFLINE_BUILD)
+-        if (IMHEX_PATTERNS_PULL_MASTER)
+-            set(PATTERNS_BRANCH master)
+-        else ()
+-            set(PATTERNS_BRANCH ImHex-v${IMHEX_VERSION})
+-        endif ()
+-
 -        FetchContent_Declare(
 -            imhex_patterns
 -            GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
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 430b36ee3bd3..670492dd7f6d 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 55d0ae1c4375c4f92f8cccc56fdb2011e06868ad Mon Sep 17 00:00:00 2001
+From 378136d61a0b80e275b8927bcf5abae765bca618 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
diff --git a/0003-fix-Deduplicate-resources-directories.patch b/0003-fix-Deduplicate-resources-directories.patch
index b1a053446d1c..2e2773757a3f 100644
--- a/0003-fix-Deduplicate-resources-directories.patch
+++ b/0003-fix-Deduplicate-resources-directories.patch
@@ -1,4 +1,4 @@
-From 33505ec80d294b531baf9f83e5f2d7fdc6eb4218 Mon Sep 17 00:00:00 2001
+From 217207da194cdf9136fd4cee16d4ba6f57491f68 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 6fa817aa..a2e1263e 100644
+index 392237af..53cce4c3 100644
 --- a/lib/libimhex/source/helpers/fs.cpp
 +++ b/lib/libimhex/source/helpers/fs.cpp
 @@ -1,4 +1,5 @@
diff --git a/PKGBUILD b/PKGBUILD
index ea5cdd6a2fb3..6858f30e811d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=ImHex
 pkgname=${_pkgname,,}
-pkgver=1.19.2
+pkgver=1.19.3
 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'
@@ -31,27 +31,27 @@ cksums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        '559898873'
-        '540260233'
-        '1832599645')
+        '352208527'
+        '2380891546'
+        '187806777')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '244a57aff73da60f6e20f7a5086b3fea3d34bf30d39d1de247e1ab9cb631bec8'
-            '9fee7806ded795954b8f5131d1799dc2a15011af22b44be4f83e84fe7bf02060'
-            '255b25c94298b06b1ec725e05a3e113a533d0001dae28909b8c34fc621081b6b')
+            'f38410d3b7fbf61cab51d9258c2f554fe04cfa59962bfb1ffa2086970a56bf02'
+            'a5fc4f0a7a7fa7465ba9ed29e1b49cf0d9cdc0477be93628768d0566309c909b'
+            '44f737ed46d529e860084975c2a2a50e439b0baabf41205c2cbe50263b9621d3')
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        'c808b3b0dd174cd1233e949aed76e34cd21f432ca1b27fb582b9da279f025384ceab38fa8af797aec422e2d0e8941476a804b7f462ddb25c0439e1b0f96ce861'
-        'a7532a182bce2fc946f117d20e0da499e0cdc7ef8fe1df4ff9fa77d6c6b0bb682f669ccf5a7e18792c74bcf9998fd86b0e2043f129bde069de29f01a8f58fd12'
-        'a7669b46e4e6a0da883ca556a36d37c71be5420f376a9a684a3499dfc1bb32e667fe76d4177a85f2af1d9eeafaecbe8ae57a13ce1ddff593e38bf5f097fbb4a8')
+        'a0e733be3d9373f572992effa943e4da3d88d35bd634daea1617adb63ff22ef3c07b919671c7ac1a6761e67bc9a703e77882f7bbf947c3271afe36512c8d1c99'
+        '39f71cc1c09f8d0b5eb70952b017aa0e57907c4dba8cc071fcc1b03b1ba95aed080db6c8de44ac59e92cbf22c58afcaeded424603ddad0e2af0495a7f5bcc38e'
+        '085b99b69d98256eb0078fe86b62921a1e0a9328e9992805e298a6de9a16d99d33fe0bf239711e1ca27c65cc29d6f733fac3dadc9d914860f128c697bd5e6f22')
 options=(!lto)
 
 prepare() {