sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (98ef967929266c05d5f9bf35fd98cc62b29adf4e)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (98ef967929266c05d5f9bf35fd98cc62b29adf4e)
- Date: Tue, 14 Apr 2026 11:48:35 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
devel/imhex/CONFIGURE |
1
devel/imhex/DEPENDS |
6 -
devel/imhex/DETAILS |
17 ----
devel/imhex/HISTORY |
7 +
devel/imhex/PREPARE |
2
devel/imhex/PRE_BUILD |
3
devel/imhex/patches/0001-Declare-wanting-64-bit-file-offset-type.patch |
41 ++++++++++
7 files changed, 57 insertions(+), 20 deletions(-)
New commits:
commit 98ef967929266c05d5f9bf35fd98cc62b29adf4e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
imhex: Fix build against musl libc
commit 11a2d99d23b5181fda67150451ab9bbcfd43520c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
imhex: Remove branch selection
commit 08ae59e19d8586bbf3cbb8618f1a51f0b06f52a4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
imhex 1.38.1
diff --git a/devel/imhex/CONFIGURE b/devel/imhex/CONFIGURE
index 90942b1..5b065be 100755
--- a/devel/imhex/CONFIGURE
+++ b/devel/imhex/CONFIGURE
@@ -1 +1,2 @@
+persistent_remove IMHEX_BRANCH &&
. "${GRIMOIRE}/CMAKE_CONFIGURE"
diff --git a/devel/imhex/DEPENDS b/devel/imhex/DEPENDS
index 652fb07..d11b52a 100755
--- a/devel/imhex/DEPENDS
+++ b/devel/imhex/DEPENDS
@@ -1,9 +1,5 @@
. "${GRIMOIRE}/CMAKE_DEPENDS" &&
-if [[ "${IMHEX_BRANCH}" == "scm" ]]; then
- depends git
-fi &&
-
depends curl &&
depends dbus &&
depends fmt &&
@@ -12,5 +8,5 @@ depends glfw &&
depends gtk+3 &&
depends libglvnd &&
depends mbedtls &&
-depends nlohmann-json &&
+depends nlohmann_json &&
depends yara
diff --git a/devel/imhex/DETAILS b/devel/imhex/DETAILS
index 679750a..116204e 100755
--- a/devel/imhex/DETAILS
+++ b/devel/imhex/DETAILS
@@ -1,21 +1,12 @@
. "${GRIMOIRE}/FUNCTIONS"
. "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL="imhex"
-if [[ "${IMHEX_BRANCH}" == "scm" ]]; then
- VERSION="$(get_scm_version)"
- SOURCE="${SPELL}-scm.tar.xz"
- FORCE_DOWNLOAD="on"
- SOURCE_URL[0]="git_http://github.com/WerWolv/${SPELL}:${SPELL}-scm:main"
- SOURCE_IGNORE="volatile"
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
-else
- VERSION="1.30.1"
-
SOURCE_HASH="sha512:c4c9987c18b1d17133d1a3e9cb625ba05e6fb57a71ca9e4d7d61c986b43ba881c4993a3c79bd0cd311696a8e0c3336f4c22b7d1886feb0b42e5e978f99c53402"
+ VERSION=1.38.1
+
SOURCE_HASH=sha512:52c3119a4929bcc30ebfa9147c89a251ad5bf6b2bb793e3a494b2f65eb11c1f166d0a0d92ba1c9a24d4000d3264309788f34754a31e01175eda875181fdaf6dd
SOURCE="ImHex-${VERSION}.tar.gz"
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/ImHex-${VERSION}"
-
SOURCE_URL[0]="https://github.com/WerWolv/ImHex/archive/refs/tags/v${VERSION}.tar.gz"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/ImHex"
+
SOURCE_URL[0]=https://github.com/WerWolv/ImHex/releases/download/v$VERSION/Full.Sources.tar.gz
# Watch: https://github.com/WerWolv/ImHex/tags tags/v([0-9.]+)[.]tar
-fi
WEB_SITE="https://imhex.werwolv.net/"
ENTERED="202300810"
LICENSE[0]="GPL"
diff --git a/devel/imhex/HISTORY b/devel/imhex/HISTORY
index 1805bd9..146be52 100644
--- a/devel/imhex/HISTORY
+++ b/devel/imhex/HISTORY
@@ -1,3 +1,10 @@
+2026-04-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.38.1
+ * DEPENDS: fixed typo
+ * CONFIGURE, DEPENDS, DETAILS, PREPARE: removed branch selection
+ * PRE_BUILD,
patches/0001-Declare-wanting-64-bit-file-offset-type.patch:
+ fixed build against musl libc
+
2023-08-10 Pavel Vinogradov <public AT sourcemage.org>
* CONFIGURE, DEPENDS, DETAILS, PREPARE: created the spell, version
1.30.1
diff --git a/devel/imhex/PREPARE b/devel/imhex/PREPARE
deleted file mode 100755
index 40600f7..0000000
--- a/devel/imhex/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable devel scm
diff --git a/devel/imhex/PRE_BUILD b/devel/imhex/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/devel/imhex/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/devel/imhex/patches/0001-Declare-wanting-64-bit-file-offset-type.patch
b/devel/imhex/patches/0001-Declare-wanting-64-bit-file-offset-type.patch
new file mode 100644
index 0000000..7062a4f
--- /dev/null
+++ b/devel/imhex/patches/0001-Declare-wanting-64-bit-file-offset-type.patch
@@ -0,0 +1,41 @@
+From 33bf7cc4e05023eb79e95bb0a6f388b364fb7705 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Tue, 14 Apr 2026 08:38:13 +0200
+Subject: [PATCH] Declare wanting 64-bit file offset type
+
+Let's the libc handle it transparently, instead of manually aliasing a
+possibly non-existent function (or at least not exposed by default), and
+which is only meaningful in 32-bit systems.
+
+Origin: Source Mage
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ plugins/builtin/source/content/providers/disk_provider.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp
b/plugins/builtin/source/content/providers/disk_provider.cpp
+index 9be1d7f3d90c..09b963e709ee 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -1,5 +1,5 @@
+ #if !defined(OS_WEB)
+-
++#define _FILE_OFFSET_BITS 64
+
+ #include "content/providers/disk_provider.hpp"
+
+@@ -45,9 +45,7 @@
+ #include <sys/disk.h>
+ #endif
+
+-#if defined(OS_LINUX) && !defined(OS_FREEBSD)
+- #define lseek lseek64
+-#elif defined(OS_FREEBSD)
++#if defined(OS_FREEBSD)
+ #include <sys/disk.h>
+ #define DEFAULT_SECTOR_SIZE 512
+ #endif
+--
+Fixed up by sm-checkpatch 0.1
+
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (98ef967929266c05d5f9bf35fd98cc62b29adf4e), Ismael Luceno, 04/14/2026
Archive powered by MHonArc 2.6.24.