upgpkg: imhex 1.32.1-1

upstream release

6 files changed, 80 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33ef7805285a..591057f919f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = imhex
 	pkgdesc = A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM
-	pkgver = 1.31.0
-	pkgrel = 3
+	pkgver = 1.32.1
+	pkgrel = 1
 	url = https://imhex.werwolv.net
 	arch = x86_64
 	license = GPL2
 	makedepends = git
 	makedepends = cmake
 	makedepends = llvm
-	makedepends = nlohmann-json
 	makedepends = librsvg
+	makedepends = nlohmann-json
 	makedepends = python
 	makedepends = cli11
 	makedepends = dotnet-runtime
@@ -17,28 +17,28 @@ pkgbase = imhex
 	depends = mbedtls
 	depends = curl
 	depends = dbus
+	depends = libarchive
 	depends = freetype2
 	depends = file
 	depends = hicolor-icon-theme
 	depends = xdg-desktop-portal
 	depends = fmt
 	depends = yara
+	depends = capstone
 	optdepends = dotnet-runtime: support for .NET scripts
 	provides = imhex-patterns
 	conflicts = imhex-patterns-git
 	options = !lto
 	options = !strip
-	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.31.0
-	source = nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git#commit=800f58283fbc1f3950abd881357fb44c22f3f44e
+	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.32.1
+	source = nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git#commit=5786fabceeaee4d892f3c7a16b243796244cdddc
 	source = xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp#commit=f01f810714443d0f10c333d4d1d9c0383be41375
-	source = libromfs::git+https://github.com/WerWolv/libromfs#commit=80b9adea2003eb01fa4cf2ecb0d77f2d9c0dd32a
-	source = capstone::git+https://github.com/capstone-engine/capstone#commit=650e85dcf23b3a3bff69144511533b7339436238
-	source = libwolv::git+https://github.com/WerWolv/libwolv#commit=128bed69ea0cf4a904e17f5690aa751b6e4b8568
-	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.31.0
-	source = imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v1.31.0
+	source = libromfs::git+https://github.com/WerWolv/libromfs#commit=0a72f7bb33d87c4fb2709b6b94bf83518ab0022d
+	source = libwolv::git+https://github.com/WerWolv/libwolv#commit=d25459dfa8e706af938427e979e454a8326c5984
+	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.32.1
+	source = imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v1.32.1
 	source = 0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
-	source = pl-0001-Use-C-23-standard.patch
-	source = pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
+	source = 0002-fix-main-Handle-different-LLVM-version.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -46,11 +46,8 @@ pkgbase = imhex
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = 6db78e5899e4ed3eb9170cb30f321706e8f8c7531b38ebf43a1e6595e6f9fc18
-	sha256sums = 9fad69a15f24d932353c1500a885640031699265dcced403d2c8e97e581274e3
-	sha256sums = 1d45242b1090daeec4b028e64598b678a2099af4ec82ab71040082c24520f314
-	b2sums = SKIP
+	sha256sums = f35c206bbda1a3d9a593e09ef30d19f46083d51985088b771e64f36cb6c53666
+	sha256sums = 436d89ec4a7aea948ccd1cb5d5cc6783079705107c6ad767e8dbe1208d395ed7
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
@@ -58,8 +55,7 @@ pkgbase = imhex
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = d393cc7a6aa26fabac6ede2e435b6df1a334c74ba981af902bcfbb77841f89dba2f110c7e025ef20a808d10fda4865c7d1ed28a39debccb1e1f797765c7bb1ee
-	b2sums = d9967d5d82b3457fe3065dd3aa69887a4f07d2c74afd686250065bf438677e1b26801c9d2b5795003b22c1224c4447864559248a29bfd34a9af2bb637bc1d515
-	b2sums = 4b38b83a9c70a05f119e2d7704ca0721ac755dda05f1f23f81e5c2d41751ea2db8212b537db133d5ab75eee7c858f103ca5825ab182b3b53c35e59278fbed527
+	b2sums = d67844dccd070ba302599c85e9a7c5269fa1d6d592b3919148f13a640ac1bd002103b75c8a721c9de40d0a96c3169ef383fe59f96d43bb5bb6f3e573ca39c5fa
+	b2sums = 90c1872766e16e76509b378437ceb8f8f0638c31cbacba29fc153a4a9046b79af1083751a8a1f73c42662bf2bf2484601c4dc4533bdf4fc0b40c4306b98a1c78
 
 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
index 8d417167076b..cc306a43350c 100644
--- a/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
+++ b/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
@@ -1,14 +1,14 @@
-From c982ce67525c28554dacd03e697f034510d84e3f Mon Sep 17 00:00:00 2001
+From 1183682561b0c6e0833f7ba645fc431836e12e04 Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
 Date: Tue, 26 Sep 2023 14:52:25 +0200
-Subject: [PATCH] fix(cmake): Fix when multiple .NET packages are installed
+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 41ea53a7..145b71d7 100644
+index 9bcb6738..d18085e0 100644
 --- a/cmake/modules/FindCoreClrEmbed.cmake
 +++ b/cmake/modules/FindCoreClrEmbed.cmake
 @@ -49,7 +49,8 @@ endif()
@@ -22,5 +22,5 @@ index 41ea53a7..145b71d7 100644
      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.42.0
+2.43.0
 
diff --git a/0002-fix-main-Handle-different-LLVM-version.patch b/0002-fix-main-Handle-different-LLVM-version.patch
new file mode 100644
index 000000000000..66ba538f239a
--- /dev/null
+++ b/0002-fix-main-Handle-different-LLVM-version.patch
@@ -0,0 +1,36 @@
+From 095536f5aaaa3ae85d6fe05ca11ba387c6ecb30f 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
+
+---
+ main/gui/source/crash_handlers.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/main/gui/source/crash_handlers.cpp b/main/gui/source/crash_handlers.cpp
+index fdda088a..005096f5 100644
+--- a/main/gui/source/crash_handlers.cpp
++++ b/main/gui/source/crash_handlers.cpp
+@@ -14,6 +14,7 @@
+ 
+ #include <nlohmann/json.hpp>
+ 
++#include <llvm/Config/llvm-config.h>
+ #include <llvm/Demangle/Demangle.h>
+ 
+ #include <csignal>
+@@ -142,7 +143,11 @@ namespace hex::crash {
+         try {
+             std::rethrow_exception(std::current_exception());
+         } catch (std::exception &ex) {
++#if LLVM_VERSION_MAJOR >= 17
+             std::string exceptionStr = hex::format("{}()::what() -> {}", llvm::itaniumDemangle(typeid(ex).name()), ex.what());
++#else
++            std::string exceptionStr = hex::format("{}()::what() -> {}", llvm::itaniumDemangle(typeid(ex).name(), nullptr, nullptr, nullptr), ex.what());
++#endif
+ 
+             handleCrash(exceptionStr);
+             log::fatal("Program terminated with uncaught exception: {}", exceptionStr);
+-- 
+2.43.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 97c1817849ab..b6444378d758 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,31 @@
 
 _pkgname=ImHex
 pkgname=${_pkgname,,}
-pkgver=1.31.0
-pkgrel=3
+pkgver=1.32.1
+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')
 arch=('x86_64')
-depends=('glfw' 'mbedtls' 'curl' 'dbus'
+depends=('glfw' 'mbedtls' 'curl' 'dbus' 'libarchive'
          'freetype2' 'file' 'hicolor-icon-theme' 'xdg-desktop-portal'
-         'fmt' 'yara')
+         'fmt' 'yara' 'capstone')
 makedepends=('git' 'cmake'
-             'llvm' 'nlohmann-json' 'librsvg'
+             'llvm' 'librsvg' 'nlohmann-json'
              'python' 'cli11' 'dotnet-runtime')
 optdepends=('dotnet-runtime: support for .NET scripts')
 provides=('imhex-patterns')
 conflicts=('imhex-patterns-git')
 source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver"
-        "nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git#commit=800f58283fbc1f3950abd881357fb44c22f3f44e"
+        "nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git#commit=5786fabceeaee4d892f3c7a16b243796244cdddc"
         "xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp#commit=f01f810714443d0f10c333d4d1d9c0383be41375"
-        "libromfs::git+https://github.com/WerWolv/libromfs#commit=80b9adea2003eb01fa4cf2ecb0d77f2d9c0dd32a"
-        "capstone::git+https://github.com/capstone-engine/capstone#commit=650e85dcf23b3a3bff69144511533b7339436238"
-        "libwolv::git+https://github.com/WerWolv/libwolv#commit=128bed69ea0cf4a904e17f5690aa751b6e4b8568"
+        # "capstone::git+https://github.com/capstone-engine/capstone#commit=097c04d9413c59a58b00d4d1c8d5dc0ac158ffaa"
+        "libromfs::git+https://github.com/WerWolv/libromfs#commit=0a72f7bb33d87c4fb2709b6b94bf83518ab0022d"
+        "libwolv::git+https://github.com/WerWolv/libwolv#commit=d25459dfa8e706af938427e979e454a8326c5984"
         "pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v$pkgver"
         "imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v$pkgver"
         0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
-        pl-0001-Use-C-23-standard.patch
-        pl-0002-makepkg-Remove-extraneous-compiler-flags.patch)
+        0002-fix-main-Handle-different-LLVM-version.patch)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -36,10 +35,8 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            '6db78e5899e4ed3eb9170cb30f321706e8f8c7531b38ebf43a1e6595e6f9fc18'
-            '9fad69a15f24d932353c1500a885640031699265dcced403d2c8e97e581274e3'
-            '1d45242b1090daeec4b028e64598b678a2099af4ec82ab71040082c24520f314')
+            'f35c206bbda1a3d9a593e09ef30d19f46083d51985088b771e64f36cb6c53666'
+            '436d89ec4a7aea948ccd1cb5d5cc6783079705107c6ad767e8dbe1208d395ed7')
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
@@ -47,21 +44,22 @@ b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        'SKIP'
-        'd393cc7a6aa26fabac6ede2e435b6df1a334c74ba981af902bcfbb77841f89dba2f110c7e025ef20a808d10fda4865c7d1ed28a39debccb1e1f797765c7bb1ee'
-        'd9967d5d82b3457fe3065dd3aa69887a4f07d2c74afd686250065bf438677e1b26801c9d2b5795003b22c1224c4447864559248a29bfd34a9af2bb637bc1d515'
-        '4b38b83a9c70a05f119e2d7704ca0721ac755dda05f1f23f81e5c2d41751ea2db8212b537db133d5ab75eee7c858f103ca5825ab182b3b53c35e59278fbed527')
+        'd67844dccd070ba302599c85e9a7c5269fa1d6d592b3919148f13a640ac1bd002103b75c8a721c9de40d0a96c3169ef383fe59f96d43bb5bb6f3e573ca39c5fa'
+        '90c1872766e16e76509b378437ceb8f8f0638c31cbacba29fc153a4a9046b79af1083751a8a1f73c42662bf2bf2484601c4dc4533bdf4fc0b40c4306b98a1c78')
 options=(!lto !strip)
 
 prepare() {
   cd "$pkgname"
 
   git submodule init
-  for name in nativefiledialog xdgpp libromfs capstone libwolv pattern_language; do
+  for name in nativefiledialog xdgpp; do
+    git config submodule.lib/third_party/$name.url "$srcdir/$name"
+  done
+  for name in libromfs libwolv pattern_language; do
     git config submodule.lib/external/$name.url "$srcdir/$name"
   done
-  for name in fmt yara/yara; do
-    git config --remove-section submodule.lib/external/$name
+  for name in capstone fmt yara/yara; do
+    git config --remove submodule.lib/third_party/$name
   done
   git -c protocol.file.allow=always submodule update
 
@@ -73,11 +71,8 @@ prepare() {
     submodule update
 
   git apply \
-    "$srcdir/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch"
-
-  git -C lib/external/pattern_language apply \
-    "$srcdir/pl-0001-Use-C-23-standard.patch" \
-    "$srcdir/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch"
+    "$srcdir/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch" \
+    "$srcdir/0002-fix-main-Handle-different-LLVM-version.patch"
 }
 
 build() {
@@ -97,7 +92,8 @@ build() {
     -D USE_SYSTEM_YARA=ON \
     -D USE_SYSTEM_FMT=ON \
     -D USE_SYSTEM_NLOHMANN_JSON=ON \
-    -D USE_SYSTEM_CAPSTONE=OFF \
+    -D USE_SYSTEM_CAPSTONE=ON \
+    -D USE_SYSTEM_CLI11=ON \
     -D IMHEX_VERSION="$pkgver"
 
   cmake --build build
diff --git a/pl-0001-Use-C-23-standard.patch b/pl-0001-Use-C-23-standard.patch
deleted file mode 100644
index 179cd30adcf7..000000000000
--- a/pl-0001-Use-C-23-standard.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9abb10e5a8aeb1fea1f3feaff56b89fcae0cf3a8 Mon Sep 17 00:00:00 2001
-From: KokaKiwi <kokakiwi+git@kokakiwi.net>
-Date: Thu, 18 Aug 2022 00:57:02 +0200
-Subject: [PATCH 1/2] Use C++23 standard
-
----
- lib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index dab1499..8bb2cfa 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.16)
-+cmake_minimum_required(VERSION 3.20)
- project(libpl)
- 
- set(CMAKE_CXX_STANDARD 23)
--- 
-2.42.0
-
diff --git a/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch b/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
deleted file mode 100644
index da14455a966d..000000000000
--- a/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f7502522f865185717c74308070739d3255d579e Mon Sep 17 00:00:00 2001
-From: KokaKiwi <kokakiwi+git@kokakiwi.net>
-Date: Sat, 17 Sep 2022 16:27:17 +0200
-Subject: [PATCH 2/2] makepkg: Remove extraneous compiler flags
-
----
- lib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 8bb2cfa..74ed841 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -71,7 +71,7 @@ add_library(libpl ${LIBRARY_TYPE}
- )
- 
- if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
--    target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
-+    target_compile_options(libpl PRIVATE -Wno-unknown-pragmas -Wno-array-bounds)
-     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-         target_compile_options(libpl PRIVATE -Wno-stringop-overflow)
-     endif()
--- 
-2.42.0
-