summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKokaKiwi2024-01-05 00:43:13 +0100
committerKokaKiwi2024-01-05 00:43:13 +0100
commitebf6b86fd84a84cf3be2dad47aa22dc29c3452bd (patch)
treee5ffacd31c8101b3ca55b1e53097ca48515dcd75
parent93ee51eaabe814a0d502a9117d66a514a30676f5 (diff)
downloadaur-ebf6b86fd84a84cf3be2dad47aa22dc29c3452bd.tar.gz
upgpkg: imhex 1.32.2-1
upstream release
-rw-r--r--.SRCINFO17
-rw-r--r--0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch2
-rw-r--r--0002-fix-main-Handle-different-LLVM-version.patch15
-rw-r--r--PKGBUILD12
4 files changed, 23 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 591057f919f2..2e7bd2642893 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.32.1
+ pkgver = 1.32.2
pkgrel = 1
url = https://imhex.werwolv.net
arch = x86_64
@@ -17,7 +17,6 @@ pkgbase = imhex
depends = mbedtls
depends = curl
depends = dbus
- depends = libarchive
depends = freetype2
depends = file
depends = hicolor-icon-theme
@@ -30,13 +29,13 @@ pkgbase = imhex
conflicts = imhex-patterns-git
options = !lto
options = !strip
- source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.32.1
+ source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.32.2
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=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 = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.32.2
+ source = imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v1.32.2
source = 0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
source = 0002-fix-main-Handle-different-LLVM-version.patch
sha256sums = SKIP
@@ -46,8 +45,8 @@ pkgbase = imhex
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = f35c206bbda1a3d9a593e09ef30d19f46083d51985088b771e64f36cb6c53666
- sha256sums = 436d89ec4a7aea948ccd1cb5d5cc6783079705107c6ad767e8dbe1208d395ed7
+ sha256sums = 3b27f99abc4040630f53cb098b67d4a8086d87c9c2c6e0a6a29afd83dcd6ec3a
+ sha256sums = 6cd6297b2269a7299f81781e9f4bcaa4b78bc69d757d2eafab10433daee6ed48
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
@@ -55,7 +54,7 @@ pkgbase = imhex
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
- b2sums = d67844dccd070ba302599c85e9a7c5269fa1d6d592b3919148f13a640ac1bd002103b75c8a721c9de40d0a96c3169ef383fe59f96d43bb5bb6f3e573ca39c5fa
- b2sums = 90c1872766e16e76509b378437ceb8f8f0638c31cbacba29fc153a4a9046b79af1083751a8a1f73c42662bf2bf2484601c4dc4533bdf4fc0b40c4306b98a1c78
+ b2sums = 4c1c0451e3c4033ed331f6339342926f1ee25b6097cc9bf540f6944f089a3db2eaa42237a673522dbcfe37540b9be9563a12b5aa146d5c5e873cce36ca637b99
+ b2sums = 0e6fdf7cb14df8c2983822c5bc52c080d68fbc57d995cc9e24c6a84589e2dd904e48e4657a27155dcab9048a720f5d60e8fc2d70ab5d8d42b3186703a878a960
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 cc306a43350c..67c489ef1553 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,4 +1,4 @@
-From 1183682561b0c6e0833f7ba645fc431836e12e04 Mon Sep 17 00:00:00 2001
+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
diff --git a/0002-fix-main-Handle-different-LLVM-version.patch b/0002-fix-main-Handle-different-LLVM-version.patch
index 66ba538f239a..f9b42fbc85e4 100644
--- a/0002-fix-main-Handle-different-LLVM-version.patch
+++ b/0002-fix-main-Handle-different-LLVM-version.patch
@@ -1,25 +1,26 @@
-From 095536f5aaaa3ae85d6fe05ca11ba387c6ecb30f Mon Sep 17 00:00:00 2001
+From 460ae24e289f8c10696b88a468a94100b2a39965 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(+)
+ 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 fdda088a..005096f5 100644
+index 2ddf766c..2ff85621 100644
--- a/main/gui/source/crash_handlers.cpp
+++ b/main/gui/source/crash_handlers.cpp
-@@ -14,6 +14,7 @@
-
+@@ -14,6 +14,8 @@
#include <nlohmann/json.hpp>
+ #include <stacktrace.hpp>
++
+#include <llvm/Config/llvm-config.h>
#include <llvm/Demangle/Demangle.h>
#include <csignal>
-@@ -142,7 +143,11 @@ namespace hex::crash {
+@@ -142,7 +144,11 @@ namespace hex::crash {
try {
std::rethrow_exception(std::current_exception());
} catch (std::exception &ex) {
diff --git a/PKGBUILD b/PKGBUILD
index b6444378d758..dd566d28bf5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
_pkgname=ImHex
pkgname=${_pkgname,,}
-pkgver=1.32.1
+pkgver=1.32.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')
arch=('x86_64')
-depends=('glfw' 'mbedtls' 'curl' 'dbus' 'libarchive'
+depends=('glfw' 'mbedtls' 'curl' 'dbus'
'freetype2' 'file' 'hicolor-icon-theme' 'xdg-desktop-portal'
'fmt' 'yara' 'capstone')
makedepends=('git' 'cmake'
@@ -35,8 +35,8 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'f35c206bbda1a3d9a593e09ef30d19f46083d51985088b771e64f36cb6c53666'
- '436d89ec4a7aea948ccd1cb5d5cc6783079705107c6ad767e8dbe1208d395ed7')
+ '3b27f99abc4040630f53cb098b67d4a8086d87c9c2c6e0a6a29afd83dcd6ec3a'
+ '6cd6297b2269a7299f81781e9f4bcaa4b78bc69d757d2eafab10433daee6ed48')
b2sums=('SKIP'
'SKIP'
'SKIP'
@@ -44,8 +44,8 @@ b2sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'd67844dccd070ba302599c85e9a7c5269fa1d6d592b3919148f13a640ac1bd002103b75c8a721c9de40d0a96c3169ef383fe59f96d43bb5bb6f3e573ca39c5fa'
- '90c1872766e16e76509b378437ceb8f8f0638c31cbacba29fc153a4a9046b79af1083751a8a1f73c42662bf2bf2484601c4dc4533bdf4fc0b40c4306b98a1c78')
+ '4c1c0451e3c4033ed331f6339342926f1ee25b6097cc9bf540f6944f089a3db2eaa42237a673522dbcfe37540b9be9563a12b5aa146d5c5e873cce36ca637b99'
+ '0e6fdf7cb14df8c2983822c5bc52c080d68fbc57d995cc9e24c6a84589e2dd904e48e4657a27155dcab9048a720f5d60e8fc2d70ab5d8d42b3186703a878a960')
options=(!lto !strip)
prepare() {