imhex: update to 1.26.2.

This commit is contained in:
classabbyamp 2023-01-07 10:43:47 -05:00
parent 35bd890169
commit ad255b196e
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
3 changed files with 3 additions and 45 deletions

View File

@ -1,13 +0,0 @@
https://github.com/WerWolv/libromfs/commit/beec45afc942209cc34d30f99eac42b2bb04aa79
--- a/ImHex/lib/external/libromfs/lib/CMakeLists.txt
+++ b/ImHex/lib/external/libromfs/lib/CMakeLists.txt
@@ -18,7 +18,7 @@
# Make sure libromfs gets rebuilt when any of the resources are changed
add_custom_command(OUTPUT ${ROMFS}
- COMMAND $<TARGET_FILE:generator-${LIBROMFS_PROJECT_NAME}>
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:generator-${LIBROMFS_PROJECT_NAME}>
DEPENDS ../generator ${ROMFS_FILES}
)

View File

@ -1,29 +0,0 @@
From a966cab1551e0e15e4261c55349b27f84d29cecc Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Mon, 19 Dec 2022 07:15:18 +0100
Subject: [PATCH] build: Use correct fcntl.h include on Linux
---
plugins/builtin/include/content/providers/file_provider.hpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
index 61da65cc8db2..ce8ee7084e0c 100644
--- a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+++ b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
@@ -9,10 +9,14 @@
#if defined(OS_WINDOWS)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#elif defined(OS_MACOS)
+ #include <sys/mman.h>
+ #include <unistd.h>
+ #include <sys/fcntl.h>
#else
#include <sys/mman.h>
#include <unistd.h>
- #include <sys/fcntl.h>
+ #include <fcntl.h>
#endif
namespace hex::plugin::builtin {

View File

@ -1,6 +1,6 @@
# Template file for 'imhex'
pkgname=imhex
version=1.25.0
version=1.26.2
revision=1
build_wrksrc="ImHex"
build_style=cmake
@ -20,8 +20,8 @@ homepage="https://imhex.werwolv.net/"
changelog="https://github.com/WerWolv/ImHex/releases"
distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
checksum="59817990bb1ab2377143480d4a26171ea631bcecdbc6682b2f79bed2a30e7eed
aff9b14a67bea48a06365b1d702af3b6c9cee9161912dd4daadd3f34ae8ee204"
checksum="3cafd153c8b2c3d283242b13d73a87494acff40194bb160077af4f9493facda8
bf7222495ea595b1eb1350196da1dd1f720e7cd5544542fa8cd7a48dc0b4d562"
if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
broken="uses i128"