From 6435fbd3deb67a254b4e79d77eff2065d1628968 Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Sun, 23 Feb 2025 04:44:21 +0200 Subject: [PATCH] why do they push the boost as mandatory in guru overlay for imhex? --- app-editors/imhex/Manifest | 4 ++-- .../imhex/files/cmake_boost_regex.patch | 11 ++++++++++ app-editors/imhex/files/cmake_mbedtls.patch | 20 +++++++++++++++++++ ....36.2-r1.ebuild => imhex-1.37.1-r1.ebuild} | 14 +++++++++---- .../md5-cache/app-editors/imhex-1.37.1-r1 | 17 ++++++++++++++++ 5 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 app-editors/imhex/files/cmake_boost_regex.patch create mode 100644 app-editors/imhex/files/cmake_mbedtls.patch rename app-editors/imhex/{imhex-1.36.2-r1.ebuild => imhex-1.37.1-r1.ebuild} (90%) create mode 100644 metadata/md5-cache/app-editors/imhex-1.37.1-r1 diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest index f213b25..46c1087 100644 --- a/app-editors/imhex/Manifest +++ b/app-editors/imhex/Manifest @@ -1,2 +1,2 @@ -DIST imhex-1.36.2.gh.tar.gz 33211537 BLAKE2B e0c9c8ae8ce003a3115a239d89a660e7dd1c2c709c8aa1007463ddfc7861a5f10394cef1621a09ed9f7bd90fbfa5249a14aed619bd9f50c53500a1a9dc090aa0 SHA512 071bde53b20d68e9300922d507f20ee847bcb7c26e87c4a896126355cc9107dd0fd0226a6b74cc9792c1d1d1f6e75b50fa185f3556e490de96893cdce9e20031 -DIST imhex-patterns-1.36.2.gh.tar.gz 13564417 BLAKE2B 891f8610f643616c5e7625a2a1ca6035038ef67aa6e425fe9fb997a2b18484800bc8caa0ebb52bdeadd61595409b1b768d4bedc22621622c5865143a663507a7 SHA512 d19ca8d9eaa56a6e3e10ffe70aa6df6df49ae008365c182d6c6f7ffda3eae0f41ff40ab6d7670132e753fc7723555064a7cc61122ad20f5b77a35c48119fea26 +DIST imhex-1.37.1.gh.tar.gz 33722261 BLAKE2B b6cd8c03fe058a2b30d12dfa6ee89ff69ec5baa9857c3c94ad0489364b646f616f133b03affbf4706dec40ddac27753d6ba4581c55b3150a519e640e0a2ad525 SHA512 2a57fcf6d38e533a4db1b007e1e5e74748db2b36dad9dd67880bbabdeb1d107b020673e1ee59befa225b7eed30bec093577c0c35f95427f49ded058e4cdfb44c +DIST imhex-patterns-1.37.1.gh.tar.gz 13620614 BLAKE2B ab909571ef060b664db523e3258e7bfda58c96a2a126a9b8a4eed933c2f6bf8e21e4836d0997757b6d0aae9746a613599a351a12dd573ebb7283999be7954838 SHA512 1e7bcf6798597d1cb12b521ecbc646b200cb71fc4569d7d9da10b5432c8ae658f8bf2e78aabb27ebd2dc2b154153f2e9dab40af7396e57c682d76f5da8ff87a6 diff --git a/app-editors/imhex/files/cmake_boost_regex.patch b/app-editors/imhex/files/cmake_boost_regex.patch new file mode 100644 index 0000000..be20b2c --- /dev/null +++ b/app-editors/imhex/files/cmake_boost_regex.patch @@ -0,0 +1,11 @@ +--- a/cmake/build_helpers.cmake ++++ b/cmake/build_helpers.cmake +@@ -823,7 +823,7 @@ macro(addBundledLibraries) + endif() + + if (USE_SYSTEM_BOOST) +- find_package(Boost REQUIRED) ++ find_package(Boost REQUIRED COMPONENTS regex) + set(BOOST_LIBRARIES Boost::regex) + else() + add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/boost ${CMAKE_CURRENT_BINARY_DIR}/boost EXCLUDE_FROM_ALL) diff --git a/app-editors/imhex/files/cmake_mbedtls.patch b/app-editors/imhex/files/cmake_mbedtls.patch new file mode 100644 index 0000000..62263f1 --- /dev/null +++ b/app-editors/imhex/files/cmake_mbedtls.patch @@ -0,0 +1,20 @@ +--- a/cmake/modules/FindmbedTLS.cmake ++++ b/cmake/modules/FindmbedTLS.cmake +@@ -19,13 +19,13 @@ + # All rights reserved. + + +-FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/version.h) ++FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/version.h PATH_SUFFIXES mbedtls3) + + SET(MBEDTLS_FIND_QUIETLY TRUE) + +-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) + + IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY) + SET(MBEDTLS_FOUND TRUE) diff --git a/app-editors/imhex/imhex-1.36.2-r1.ebuild b/app-editors/imhex/imhex-1.37.1-r1.ebuild similarity index 90% rename from app-editors/imhex/imhex-1.36.2-r1.ebuild rename to app-editors/imhex/imhex-1.37.1-r1.ebuild index 2fad900..3693976 100644 --- a/app-editors/imhex/imhex-1.36.2-r1.ebuild +++ b/app-editors/imhex/imhex-1.37.1-r1.ebuild @@ -19,7 +19,7 @@ S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="+system-llvm test lto +desktop-portal" +IUSE="+system-llvm test lto +desktop-portal lz4 boost" RESTRICT="!test? ( test )" PATCHES=( @@ -28,7 +28,11 @@ PATCHES=( # Because it did not cause any issue, we can disable it "${FILESDIR}/remove_dotnet.patch" # Remove the different -Werror flags - "${FILESDIR}/remove_Werror.patch" + #"${FILESDIR}/remove_Werror.patch" + # Correct the cmake MbedTLS search call + "${FILESDIR}/cmake_mbedtls.patch" + # Set boost components to regex + "${FILESDIR}/cmake_boost_regex.patch" ) DEPEND=" @@ -45,7 +49,7 @@ DEPEND=" >=media-libs/glfw-3.4[X] media-libs/glm media-libs/libglvnd - net-libs/mbedtls:0= + net-libs/mbedtls:= net-misc/curl sys-apps/file sys-libs/zlib @@ -54,9 +58,10 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - system-llvm? ( llvm-core/llvm ) app-admin/chrpath gnome-base/librsvg + lz4? ( app-arch/lz4 ) + system-llvm? ( llvm-core/llvm ) " pkg_pretend() { @@ -102,6 +107,7 @@ src_configure() { -D IMHEX_COMPRESS_DEBUG_INFO=OFF \ -D IMHEX_VERSION="${PV}" \ -D PROJECT_VERSION="${PV}" \ + -D USE_SYSTEM_BOOST=$(usex boost) \ -D USE_SYSTEM_CAPSTONE=ON \ -D USE_SYSTEM_FMT=ON \ -D USE_SYSTEM_LLVM=$(usex system-llvm) \ diff --git a/metadata/md5-cache/app-editors/imhex-1.37.1-r1 b/metadata/md5-cache/app-editors/imhex-1.37.1-r1 new file mode 100644 index 0000000..94aefeb --- /dev/null +++ b/metadata/md5-cache/app-editors/imhex-1.37.1-r1 @@ -0,0 +1,17 @@ +BDEPEND=app-admin/chrpath gnome-base/librsvg lz4? ( app-arch/lz4 ) system-llvm? ( llvm-core/llvm ) app-alternatives/ninja >=dev-build/cmake-3.20.5 +DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack +DEPEND=app-arch/bzip2 app-arch/xz-utils app-arch/zstd:= app-forensics/yara:= >=dev-cpp/nlohmann_json-3.10.2 dev-libs/capstone:= >=dev-libs/nativefiledialog-extended-1.2.1[desktop-portal?] >=dev-libs/libfmt-8.0.0:= media-libs/fontconfig media-libs/freetype >=media-libs/glfw-3.4[X] media-libs/glm media-libs/libglvnd net-libs/mbedtls:= net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv virtual/libintl +DESCRIPTION=A hex editor for reverse engineers, programmers, and eyesight +EAPI=8 +HOMEPAGE=https://github.com/WerWolv/ImHex +INHERIT=cmake llvm-r1 toolchain-funcs flag-o-matic xdg-utils +IUSE=+system-llvm test lto +desktop-portal lz4 boost +llvm_slot_19 llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 +KEYWORDS=~amd64 +LICENSE=GPL-2 +RDEPEND=app-arch/bzip2 app-arch/xz-utils app-arch/zstd:= app-forensics/yara:= >=dev-cpp/nlohmann_json-3.10.2 dev-libs/capstone:= >=dev-libs/nativefiledialog-extended-1.2.1[desktop-portal?] >=dev-libs/libfmt-8.0.0:= media-libs/fontconfig media-libs/freetype >=media-libs/glfw-3.4[X] media-libs/glm media-libs/libglvnd net-libs/mbedtls:= net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv virtual/libintl +REQUIRED_USE=^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 llvm_slot_19 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/WerWolv/ImHex/releases/download/v1.37.1/Full.Sources.tar.gz -> imhex-1.37.1.gh.tar.gz https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v1.37.1.tar.gz -> imhex-patterns-1.37.1.gh.tar.gz +_eclasses_=toolchain-funcs 6afdb6107430c1832ca7e16aacbf8fa1 multilib b2a329026f2e404e9e371097dda47f96 flag-o-matic 357f1a896fbedcd06e5ce55419c49eb9 multiprocessing 1e32df7deee68372153dca65f4a7c21f ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 xdg-utils 42869b3c8d86a70ef3cf75165a395e09 cmake 10a50dfaf728b802fcfd37f8d0da9056 llvm-utils 7f49c40879f833f9d07e2d5a9643077b llvm-r1 0bd586d3786517cd63802a520b404dda +_md5_=eb0afc619513c7420fedfa05b45ec681