upgpkg: imhex 1.33.0-1

upstream release

4 files changed, 25 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c4521346cf3..ba103fff7f7d 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.32.2
-	pkgrel = 2
+	pkgver = 1.33.0
+	pkgrel = 1
 	url = https://imhex.werwolv.net
 	arch = x86_64
 	license = GPL-2.0-or-later
@@ -29,17 +29,14 @@ pkgbase = imhex
 	conflicts = imhex-patterns-git
 	options = !lto
 	options = !strip
-	source = imhex-1.32.2.tar.gz::https://github.com/WerWolv/ImHex/releases/download/v1.32.2/Full.Sources.tar.gz
-	source = imhex-patterns-1.32.2.tar.gz::https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v1.32.2.tar.gz
-	source = 0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
-	source = 0002-fix-main-Handle-different-LLVM-version.patch
-	sha256sums = 44564e7326e056f9ee698ae972bb0fb624716052466f0f504404e3f366c4c9ed
-	sha256sums = c2bf92cf468498ccc8a27ff6c3284f59946b0cc064fe41c37885a31018360ad0
-	sha256sums = 3b27f99abc4040630f53cb098b67d4a8086d87c9c2c6e0a6a29afd83dcd6ec3a
-	sha256sums = 6cd6297b2269a7299f81781e9f4bcaa4b78bc69d757d2eafab10433daee6ed48
-	b2sums = 75d595e5acb05429b114f4d4c61981080797f7b88d41a219c93f6512c4b204dd164a8886c00af4ee539cb7d6f7baaa49084b349806357fb872a1ebb30e82cfba
-	b2sums = b171669c17c0a7aef0ba65b66c2f68f7581a8e11d61365363fd28cfedfa2658c8833181d5e8a4c789ff011c5afadafec8149b43852319cae161c9bb5c26be2ec
-	b2sums = 4c1c0451e3c4033ed331f6339342926f1ee25b6097cc9bf540f6944f089a3db2eaa42237a673522dbcfe37540b9be9563a12b5aa146d5c5e873cce36ca637b99
-	b2sums = 0e6fdf7cb14df8c2983822c5bc52c080d68fbc57d995cc9e24c6a84589e2dd904e48e4657a27155dcab9048a720f5d60e8fc2d70ab5d8d42b3186703a878a960
+	source = imhex-1.33.0.tar.gz::https://github.com/WerWolv/ImHex/releases/download/v1.33.0/Full.Sources.tar.gz
+	source = imhex-patterns-1.33.0.tar.gz::https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v1.33.0.tar.gz
+	source = 0001-fix-main-Handle-different-LLVM-version.patch
+	sha256sums = 60f354ed3f2ef96c26496680cacae7b215422ca01669daf7513f20e5a2916026
+	sha256sums = f5af93edd9b60b08ece6a5856f8d6db1e616ca9f2eebb299c81b29c5cbd40cda
+	sha256sums = c0ba479d827bac8cd013c6d537ebb2f47e88092c37155f08ae3dc578cc56dae1
+	b2sums = 12ea429fe41849d756020bc2f98176e8aaad54c78447f42ae3f5b333cf2cae43370228f37fae8168df90c116d91a932490b0730b31e71b5bc3495a1fce8d7fbd
+	b2sums = 33493fc825882e4ed08e5a682cb20ba76866aacbbb7568e856619b6821e191a6e6ac37bfc2dc77474df9385a05464240c0b255e9221a01ec348c813ae7c507db
+	b2sums = df471cd0ac06d066161811b37c87e9fc755134477b916f9b0db83b427ec647a432c4c64e936bde20677e67377b3a64cf8aaa4d40ed52cca32312439824bde7fe
 
 pkgname = imhex
diff --git a/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch b/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
deleted file mode 100644
index 67c489ef1553..000000000000
--- a/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 07b603fa2fc4a3b980ac39ede97e221549cffdb1 Mon Sep 17 00:00:00 2001
-From: KokaKiwi <kokakiwi+git@kokakiwi.net>
-Date: Tue, 26 Sep 2023 14:52:25 +0200
-Subject: [PATCH 1/2] fix(cmake): Fix when multiple .NET packages are installed
-
----
- cmake/modules/FindCoreClrEmbed.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindCoreClrEmbed.cmake b/cmake/modules/FindCoreClrEmbed.cmake
-index 9bcb6738..d18085e0 100644
---- a/cmake/modules/FindCoreClrEmbed.cmake
-+++ b/cmake/modules/FindCoreClrEmbed.cmake
-@@ -49,7 +49,8 @@ endif()
- set(CoreClrEmbed_ROOT_PATH "${CORECLR_RUNTIME_ROOT_PATH}")
- 
- 
--file(GLOB _CORECLR_HOST_ARCH_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.*-${CORECLR_SUBARCH}")
-+file(GLOB _CORECLR_HOST_ARCH_PATH_LIST "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.*-${CORECLR_SUBARCH}")
-+list(POP_FRONT _CORECLR_HOST_ARCH_PATH_LIST _CORECLR_HOST_ARCH_PATH)
- if (_CORECLR_HOST_ARCH_PATH)
-     get_filename_component(_CORECLR_HOST_ARCH_FILENAME ${_CORECLR_HOST_ARCH_PATH} NAME)
-     string(REPLACE "Microsoft.NETCore.App.Host." "" _CORECLR_COMPUTED_ARCH "${_CORECLR_HOST_ARCH_FILENAME}")
--- 
-2.43.0
-
diff --git a/0002-fix-main-Handle-different-LLVM-version.patch b/0001-fix-main-Handle-different-LLVM-version.patch
index f9b42fbc85e4..1e7a30b882b5 100644
--- a/0002-fix-main-Handle-different-LLVM-version.patch
+++ b/0001-fix-main-Handle-different-LLVM-version.patch
@@ -1,14 +1,14 @@
-From 460ae24e289f8c10696b88a468a94100b2a39965 Mon Sep 17 00:00:00 2001
+From be234084019fef70a7cb45e4f6208e340fc2d5f0 Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
 Date: Sun, 31 Dec 2023 13:29:36 +0100
-Subject: [PATCH 2/2] fix(main): Handle different LLVM version
+Subject: [PATCH] fix(main): Handle different LLVM version
 
 ---
  main/gui/source/crash_handlers.cpp | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/main/gui/source/crash_handlers.cpp b/main/gui/source/crash_handlers.cpp
-index 2ddf766c..2ff85621 100644
+index 4b013d9e..9dfdebdc 100644
 --- a/main/gui/source/crash_handlers.cpp
 +++ b/main/gui/source/crash_handlers.cpp
 @@ -14,6 +14,8 @@
@@ -33,5 +33,5 @@ index 2ddf766c..2ff85621 100644
              handleCrash(exceptionStr);
              log::fatal("Program terminated with uncaught exception: {}", exceptionStr);
 -- 
-2.43.0
+2.44.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 29db5b30c569..357eed2f2255 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=ImHex
 pkgname=${_pkgname,,}
-pkgver=1.32.2
-pkgrel=2
+pkgver=1.33.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://imhex.werwolv.net'
 license=('GPL-2.0-or-later')
@@ -20,23 +20,19 @@ provides=('imhex-patterns')
 conflicts=('imhex-patterns-git')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/WerWolv/ImHex/releases/download/v$pkgver/Full.Sources.tar.gz"
         "imhex-patterns-$pkgver.tar.gz::https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v$pkgver.tar.gz"
-        0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
-        0002-fix-main-Handle-different-LLVM-version.patch)
-sha256sums=('44564e7326e056f9ee698ae972bb0fb624716052466f0f504404e3f366c4c9ed'
-            'c2bf92cf468498ccc8a27ff6c3284f59946b0cc064fe41c37885a31018360ad0'
-            '3b27f99abc4040630f53cb098b67d4a8086d87c9c2c6e0a6a29afd83dcd6ec3a'
-            '6cd6297b2269a7299f81781e9f4bcaa4b78bc69d757d2eafab10433daee6ed48')
-b2sums=('75d595e5acb05429b114f4d4c61981080797f7b88d41a219c93f6512c4b204dd164a8886c00af4ee539cb7d6f7baaa49084b349806357fb872a1ebb30e82cfba'
-        'b171669c17c0a7aef0ba65b66c2f68f7581a8e11d61365363fd28cfedfa2658c8833181d5e8a4c789ff011c5afadafec8149b43852319cae161c9bb5c26be2ec'
-        '4c1c0451e3c4033ed331f6339342926f1ee25b6097cc9bf540f6944f089a3db2eaa42237a673522dbcfe37540b9be9563a12b5aa146d5c5e873cce36ca637b99'
-        '0e6fdf7cb14df8c2983822c5bc52c080d68fbc57d995cc9e24c6a84589e2dd904e48e4657a27155dcab9048a720f5d60e8fc2d70ab5d8d42b3186703a878a960')
+        0001-fix-main-Handle-different-LLVM-version.patch)
+sha256sums=('60f354ed3f2ef96c26496680cacae7b215422ca01669daf7513f20e5a2916026'
+            'f5af93edd9b60b08ece6a5856f8d6db1e616ca9f2eebb299c81b29c5cbd40cda'
+            'c0ba479d827bac8cd013c6d537ebb2f47e88092c37155f08ae3dc578cc56dae1')
+b2sums=('12ea429fe41849d756020bc2f98176e8aaad54c78447f42ae3f5b333cf2cae43370228f37fae8168df90c116d91a932490b0730b31e71b5bc3495a1fce8d7fbd'
+        '33493fc825882e4ed08e5a682cb20ba76866aacbbb7568e856619b6821e191a6e6ac37bfc2dc77474df9385a05464240c0b255e9221a01ec348c813ae7c507db'
+        'df471cd0ac06d066161811b37c87e9fc755134477b916f9b0db83b427ec647a432c4c64e936bde20677e67377b3a64cf8aaa4d40ed52cca32312439824bde7fe')
 options=(!lto !strip)
 
 prepare() {
   cd "$_pkgname"
 
-  patch -Np1 -i "$srcdir/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch"
-  patch -Np1 -i "$srcdir/0002-fix-main-Handle-different-LLVM-version.patch"
+  patch -Np1 -i "$srcdir/0001-fix-main-Handle-different-LLVM-version.patch"
 }
 
 build() {