mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-04-07 03:10:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

app-editors/imhex: Fix errors seemingly related to cmake 4

Browse Source 
Signed-off-by: Henri Gasc <gasc@eurecom.fr>
This commit is contained in:
Henri Gasc
2025-06-09 17:18:03 +02:00
parent 85c3d49319
commit cc232c7913
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app-editors/imhex/files/cmake_mbedtls.patch
View File

@@ -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)

8
app-editors/imhex/files/imhex-1.37.4-fix-cmake-edlib.patch Normal file
View File

@@ -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)

9
app-editors/imhex/imhex-1.37.4-r3.ebuild → app-editors/imhex/imhex-1.37.4-r4.ebuild
View File

@@ -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