From 6466ae366aa2b77da89e3c01950fa47c2a520c0c Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Thu, 28 Dec 2023 01:10:03 +0000
Subject: [PATCH] community/imhex: upgrade to 1.32.1

---
 community/imhex/APKBUILD               | 16 +++++++++-------
 community/imhex/fix-lfs64.patch        |  4 ++--
 community/imhex/itanium-demangle.patch | 11 -----------
 community/imhex/no-werror.patch        |  4 ++--
 4 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 community/imhex/itanium-demangle.patch

diff --git a/community/imhex/APKBUILD b/community/imhex/APKBUILD
index bd1169f32b6..0513871ffa8 100644
--- a/community/imhex/APKBUILD
+++ b/community/imhex/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: George Hopkins <george-hopkins@null.net>
 # Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=imhex
-pkgver=1.31.0
+pkgver=1.32.1
 pkgrel=0
 pkgdesc="Hex editor for reverse engineers and programmers"
 url="https://github.com/WerWolv/ImHex"
@@ -19,6 +19,7 @@ makedepends="
 	glfw-dev
 	glm-dev
 	gtk+3.0-dev
+	libarchive-dev
 	llvm-dev
 	llvm-gtest
 	llvm-static
@@ -34,7 +35,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/WerWolv/ImHex/releases/downl
 	$pkgname-patterns-$pkgver.tar.gz::https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v$pkgver.tar.gz
 	fix-lfs64.patch
 	no-werror.patch
-	itanium-demangle.patch
 	"
 builddir="$srcdir/ImHex"
 
@@ -64,12 +64,14 @@ build() {
 
 package() {
 	DESTDIR="$pkgdir" cmake --install build
+
+	cd "$pkgdir"
+	rm -rf usr/share/imhex/sdk
 }
 
 sha512sums="
-483a89e84746ba74eb968f84140ae52edb7046d1074160a97eb6ebad6eac0284beccaf39004141cbe1eebcd8ca92d1fd486c45790880503bbcc40c7bdd586cb8  imhex-1.31.0.tar.gz
-aaeb2028bbc8235fb49ba75bdca71acf725da0035395c86df97c3976bb70f33ad34f9ce3089d72141de6767cc511c575cc3ac85b66ee4eeba8caa252fc874dba  imhex-patterns-1.31.0.tar.gz
-78f1739c7d5383fcc80182a9310fa398696c267d2cf99fa3d70ab16cef86a43e60a6604a3482882cf164da530f3ce6b19b24ecac0f138c651a9c5656ee9ea5dc  fix-lfs64.patch
-3da0bfcca12bb9023e92ec9c0f34ccd6f242b20ec6cee1c30e13e9caa77afba861889b095571a73e3759bf6c87e8a7442dd13bbf4354e7b6c585903ac4a60f1a  no-werror.patch
-b27a5835e1fcd580e41da744c6f3a264fa3554e71321c22d898d5b8ecc3eaf999b6c654cebcc00662ae2fb83e15218a4ae9700b10c4d37f9cf2fcde578dc0d00  itanium-demangle.patch
+a25c81c4c711beb1ad6ca20fbad9eeef16805c88f93b94501f20c13c73933c7022df2634f98cd7e8b1bc129ca1d62220bc14564e0a1543cb2d678afea9920af8  imhex-1.32.1.tar.gz
+0a421a0c415f5c4d38e1acffe1adab2c0c5d4411635e916477efd1ceb03b7aa291a0af8360574b0e66e7e6b96895e3ff09246a7aa10f807c03f5806214cda5f1  imhex-patterns-1.32.1.tar.gz
+dac50a201ba6e7da7578fd6b74b6c6accdb95934fe5807483959b8c5474e5ac0e9dcd10001358f60929a05c6331991c45838da710e6125d6f75f45ba0929a13c  fix-lfs64.patch
+7882b0cc1fe1c620de0757f1a2b5893b7ff395479aa870719e0662dc11625c2929e786412d9031df9653257e76edd0292a3d50492f072b2ab275e46e75c3e441  no-werror.patch
 "
diff --git a/community/imhex/fix-lfs64.patch b/community/imhex/fix-lfs64.patch
index d1e40fa41bb..75a9dfac717 100644
--- a/community/imhex/fix-lfs64.patch
+++ b/community/imhex/fix-lfs64.patch
@@ -33,8 +33,8 @@
  
          if (this->m_map != nullptr && size != this->m_fileSize) {
              this->unmap();
---- a/lib/external/miniaudio/include/miniaudio.h
-+++ b/lib/external/miniaudio/include/miniaudio.h
+--- a/lib/third_party/miniaudio/include/miniaudio.h
++++ b/lib/third_party/miniaudio/include/miniaudio.h
 @@ -13075,15 +13075,7 @@
          return ma_result_from_errno(err);
      }
diff --git a/community/imhex/itanium-demangle.patch b/community/imhex/itanium-demangle.patch
deleted file mode 100644
index 7443ffb561f..00000000000
--- a/community/imhex/itanium-demangle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main/source/crash_handlers.cpp
-+++ b/main/source/crash_handlers.cpp
-@@ -143,7 +143,7 @@
-         try {
-             std::rethrow_exception(std::current_exception());
-         } catch (std::exception &ex) {
--            std::string exceptionStr = hex::format("{}()::what() -> {}", llvm::itaniumDemangle(typeid(ex).name(), nullptr, nullptr, nullptr), ex.what());
-+            std::string exceptionStr = hex::format("{}()::what() -> {}", llvm::itaniumDemangle(typeid(ex).name()), ex.what());
-             log::fatal("Program terminated with uncaught exception: {}", exceptionStr);
- 
-         }
diff --git a/community/imhex/no-werror.patch b/community/imhex/no-werror.patch
index fb3c868c4f4..4666e5e35cd 100644
--- a/community/imhex/no-werror.patch
+++ b/community/imhex/no-werror.patch
@@ -4,8 +4,8 @@
  macro(setupCompilerFlags target)
      if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
          if (IMHEX_STRICT_WARNINGS)
--            set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror")
-+            set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic")
+-            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic -Werror")
++            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic")
          endif()
  
          set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-array-bounds")