commit: cc232c79138a2113f9eac0cdb32f8ad4f67f6473
Author: Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Mon Jun 9 15:18:03 2025 +0000
Commit: Henri Gasc <gasc <AT> eurecom <DOT> fr>
CommitDate: Mon Jun 9 15:18:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cc232c79
app-editors/imhex: Fix errors seemingly related to cmake 4
Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>
app-editors/imhex/files/cmake_mbedtls.patch | 6 +++---
app-editors/imhex/files/imhex-1.37.4-fix-cmake-edlib.patch | 8 ++++++++
.../imhex/{imhex-1.37.4-r3.ebuild => imhex-1.37.4-r4.ebuild} | 9 ++++++---
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/app-editors/imhex/files/cmake_mbedtls.patch
b/app-editors/imhex/files/cmake_mbedtls.patch
index 62263f1e77..8e3e8b6cbd 100644
--- a/app-editors/imhex/files/cmake_mbedtls.patch
+++ b/app-editors/imhex/files/cmake_mbedtls.patch
@@ -12,9 +12,9 @@
-FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls libmbedtls libmbedx509)
-FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509 libmbedx509)
-FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto libmbedcrypto)
-+FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls mbedtls3 libmbedtls libmbedx509)
-+FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509 mbedx5093 libmbedx509)
-+FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto mbedcrypto3 libmbedcrypto)
++FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls libmbedtls mbedtls-3 libmbedx509)
++FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509 libmbedx509 mbedx509-3)
++FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto libmbedcrypto mbedcrypto-3)
IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND
MBEDCRYPTO_LIBRARY)
SET(MBEDTLS_FOUND TRUE)
diff --git a/app-editors/imhex/files/imhex-1.37.4-fix-cmake-edlib.patch
b/app-editors/imhex/files/imhex-1.37.4-fix-cmake-edlib.patch
new file mode 100644
index 0000000000..8e55b904b7
--- /dev/null
+++ b/app-editors/imhex/files/imhex-1.37.4-fix-cmake-edlib.patch
@@ -0,0 +1,8 @@
+--- a/lib/third_party/edlib/CMakeLists.txt
++++ b/lib/third_party/edlib/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+ project(edlib VERSION 1.2.6)
+
+ option(EDLIB_ENABLE_INSTALL "Generate the install target" ON)
diff --git a/app-editors/imhex/imhex-1.37.4-r3.ebuild
b/app-editors/imhex/imhex-1.37.4-r4.ebuild
similarity index 93%
rename from app-editors/imhex/imhex-1.37.4-r3.ebuild
rename to app-editors/imhex/imhex-1.37.4-r4.ebuild
index aa999e3b18..65a0c6175d 100644
--- a/app-editors/imhex/imhex-1.37.4-r3.ebuild
+++ b/app-editors/imhex/imhex-1.37.4-r4.ebuild
@@ -22,6 +22,10 @@ KEYWORDS="~amd64"
IUSE="+system-llvm test lto +desktop-portal lz4"
RESTRICT="!test? ( test )"
+# Skip cmake version detection, as there are a lot of dependencies
+# (that we do not use) that wants cmake < 3.5, so it prints a warning
+CMAKE_QA_COMPAT_SKIP=yes
+
PATCHES=(
# If virtual/dotnet-sdk is installed on your system, then cmake
# will use it at some point and try to access internet.
@@ -33,13 +37,12 @@ PATCHES=(
"${FILESDIR}/cmake_boost_regex.patch"
# Temporary (until the next update) patch
"${FILESDIR}/${P}-update-libfmt.patch"
+ # Temporary patch (until the next update)
+ "${FILESDIR}/${P}-fix-cmake-edlib.patch"
)
DOCS+=( LICENSE PLUGINS.md )
-# libfmt can not be >= 11.2.0
-# See https://github.com/WerWolv/ImHex/issues/2225
-
DEPEND="
app-arch/bzip2
app-arch/xz-utils
