summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch26
-rw-r--r--PKGBUILD6
3 files changed, 16 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6609e8595671..33ef7805285a 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.31.0
- pkgrel = 2
+ pkgrel = 3
url = https://imhex.werwolv.net
arch = x86_64
license = GPL2
@@ -47,7 +47,7 @@ pkgbase = imhex
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = d6b2f6785e65df7ff4fc7c124e64af660a1af329a097ef320ea8370942ed1495
+ sha256sums = 6db78e5899e4ed3eb9170cb30f321706e8f8c7531b38ebf43a1e6595e6f9fc18
sha256sums = 9fad69a15f24d932353c1500a885640031699265dcced403d2c8e97e581274e3
sha256sums = 1d45242b1090daeec4b028e64598b678a2099af4ec82ab71040082c24520f314
b2sums = SKIP
@@ -58,7 +58,7 @@ pkgbase = imhex
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
- b2sums = 79cc57622c583b4c21b0dfccecb88653064ab21e022318237a4c85dc4ea18e786ef1b8c006fe8a73a7785516c2bfe183e6a650f4a011616123c08d461c01df7c
+ b2sums = d393cc7a6aa26fabac6ede2e435b6df1a334c74ba981af902bcfbb77841f89dba2f110c7e025ef20a808d10fda4865c7d1ed28a39debccb1e1f797765c7bb1ee
b2sums = d9967d5d82b3457fe3065dd3aa69887a4f07d2c74afd686250065bf438677e1b26801c9d2b5795003b22c1224c4447864559248a29bfd34a9af2bb637bc1d515
b2sums = 4b38b83a9c70a05f119e2d7704ca0721ac755dda05f1f23f81e5c2d41751ea2db8212b537db133d5ab75eee7c858f103ca5825ab182b3b53c35e59278fbed527
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 3e3db4846549..8d417167076b 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,32 +1,26 @@
-From edc93bedfad94976207b19649b48ab9a110a8f24 Mon Sep 17 00:00:00 2001
+From c982ce67525c28554dacd03e697f034510d84e3f 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
---
- cmake/modules/FindCoreClrEmbed.cmake | 2 ++
- 1 file changed, 2 insertions(+)
+ 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..b799b0c7 100644
+index 41ea53a7..145b71d7 100644
--- a/cmake/modules/FindCoreClrEmbed.cmake
+++ b/cmake/modules/FindCoreClrEmbed.cmake
-@@ -51,6 +51,7 @@ set(CoreClrEmbed_ROOT_PATH "${CORECLR_RUNTIME_ROOT_PATH}")
+@@ -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 "${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)
-+ list(POP_FRONT _CORECLR_HOST_ARCH_PATH _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}")
- if (_CORECLR_COMPUTED_ARCH)
-@@ -61,6 +62,7 @@ endif()
- set(CORECLR_HOST_BASE_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.${CORECLR_ARCH}/${CORECLR_RUNTIME_VERSION_FULL}")
- file(GLOB _CORECLR_FOUND_PATH ${CORECLR_HOST_BASE_PATH})
- if (_CORECLR_FOUND_PATH)
-+ list(POP_FRONT _CORECLR_FOUND_PATH _CORECLR_FOUND_PATH)
- set(CORECLR_NETHOST_ROOT "${_CORECLR_FOUND_PATH}/runtimes/${CORECLR_ARCH}/native")
- endif()
-
--
2.42.0
diff --git a/PKGBUILD b/PKGBUILD
index 8591df1e175f..97c1817849ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=ImHex
pkgname=${_pkgname,,}
pkgver=1.31.0
-pkgrel=2
+pkgrel=3
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')
@@ -37,7 +37,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'd6b2f6785e65df7ff4fc7c124e64af660a1af329a097ef320ea8370942ed1495'
+ '6db78e5899e4ed3eb9170cb30f321706e8f8c7531b38ebf43a1e6595e6f9fc18'
'9fad69a15f24d932353c1500a885640031699265dcced403d2c8e97e581274e3'
'1d45242b1090daeec4b028e64598b678a2099af4ec82ab71040082c24520f314')
b2sums=('SKIP'
@@ -48,7 +48,7 @@ b2sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- '79cc57622c583b4c21b0dfccecb88653064ab21e022318237a4c85dc4ea18e786ef1b8c006fe8a73a7785516c2bfe183e6a650f4a011616123c08d461c01df7c'
+ 'd393cc7a6aa26fabac6ede2e435b6df1a334c74ba981af902bcfbb77841f89dba2f110c7e025ef20a808d10fda4865c7d1ed28a39debccb1e1f797765c7bb1ee'
'd9967d5d82b3457fe3065dd3aa69887a4f07d2c74afd686250065bf438677e1b26801c9d2b5795003b22c1224c4447864559248a29bfd34a9af2bb637bc1d515'
'4b38b83a9c70a05f119e2d7704ca0721ac755dda05f1f23f81e5c2d41751ea2db8212b537db133d5ab75eee7c858f103ca5825ab182b3b53c35e59278fbed527')
options=(!lto !strip)