commit: 928a994d26249670789b80de68370d24e3179e57 Author: Henri Gasc <gasc <AT> eurecom <DOT> fr> AuthorDate: Sun Mar 17 10:57:01 2024 +0000 Commit: Henri Gasc <gasc <AT> eurecom <DOT> fr> CommitDate: Sun Mar 17 11:04:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=928a994d
app-editors/imhex: corrected small things Add patch to remove dotnet from the build Corrected name of sources Usage of "usex" and not "use" for cmake flags Closes: https://bugs.gentoo.org/926761 Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr> app-editors/imhex/Manifest | 4 ++-- app-editors/imhex/files/remove_dotnet.patch | 16 ++++++++++++++++ .../{imhex-1.33.1-r1.ebuild => imhex-1.33.1-r2.ebuild} | 16 ++++++++++------ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest index 2bffb61f57..47c450a5f6 100644 --- a/app-editors/imhex/Manifest +++ b/app-editors/imhex/Manifest @@ -1,2 +1,2 @@ -DIST imhex-1.33.1.tar.gz 32286361 BLAKE2B 6c53172db4a0f3a599bf648d5cf2e4a56ab477896d216b6dcb81dd7559cc05d48a213dbd3161e71e060ce6256cd9b15335d1376dd63f3a79bf23c960c59e91e2 SHA512 9b92d5a7d1664fbb6251cf07450f4aa052da6a4828cae904696d96a54d2895b124afded85005f2bf421cb10129b3ef464b2d36a832c66214140d503109f615e5 -DIST imhex-patterns-1.33.1.tar.gz 4657125 BLAKE2B 3070d06dd5ead76bf0643b551464a24e5dcac2e9aa20bd7f19d3296df87cdfb659e80e432fcbef33c4de5c8e7e97b848e0e5e386ff5db85d7564de4d5fcdd08c SHA512 e4f36ffa82df8d4d97b418c9b6a25a76d99d1649bbda9f0969480518335f4449d91e227ca02ccaab2248e2c95dfe05a33a1687cb16c4428aae57c638da44e262 +DIST imhex-1.33.1.gh.tar.gz 32286361 BLAKE2B 6c53172db4a0f3a599bf648d5cf2e4a56ab477896d216b6dcb81dd7559cc05d48a213dbd3161e71e060ce6256cd9b15335d1376dd63f3a79bf23c960c59e91e2 SHA512 9b92d5a7d1664fbb6251cf07450f4aa052da6a4828cae904696d96a54d2895b124afded85005f2bf421cb10129b3ef464b2d36a832c66214140d503109f615e5 +DIST imhex-patterns-1.33.1.gh.tar.gz 4657125 BLAKE2B 3070d06dd5ead76bf0643b551464a24e5dcac2e9aa20bd7f19d3296df87cdfb659e80e432fcbef33c4de5c8e7e97b848e0e5e386ff5db85d7564de4d5fcdd08c SHA512 e4f36ffa82df8d4d97b418c9b6a25a76d99d1649bbda9f0969480518335f4449d91e227ca02ccaab2248e2c95dfe05a33a1687cb16c4428aae57c638da44e262 diff --git a/app-editors/imhex/files/remove_dotnet.patch b/app-editors/imhex/files/remove_dotnet.patch new file mode 100644 index 0000000000..d4c4883c0b --- /dev/null +++ b/app-editors/imhex/files/remove_dotnet.patch @@ -0,0 +1,16 @@ +diff --git a/plugins/script_loader/CMakeLists.txt b/plugins/script_loader/CMakeLists.txt +index af0f6c79..cbb323e3 100644 +--- a/plugins/script_loader/CMakeLists.txt ++++ b/plugins/script_loader/CMakeLists.txt +@@ -46,7 +46,7 @@ if (CoreClrEmbed_FOUND) + install(FILES ${CoreClrEmbed_SHARED_LIBRARIES} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif () + +- add_subdirectory(dotnet) +- add_dependencies(script_loader AssemblyLoader) ++ #add_subdirectory(dotnet) ++ #add_dependencies(script_loader AssemblyLoader) + +-endif () +\ No newline at end of file ++endif () diff --git a/app-editors/imhex/imhex-1.33.1-r1.ebuild b/app-editors/imhex/imhex-1.33.1-r2.ebuild similarity index 88% rename from app-editors/imhex/imhex-1.33.1-r1.ebuild rename to app-editors/imhex/imhex-1.33.1-r2.ebuild index c6050d00ba..be797d6b78 100644 --- a/app-editors/imhex/imhex-1.33.1-r1.ebuild +++ b/app-editors/imhex/imhex-1.33.1-r2.ebuild @@ -11,8 +11,8 @@ inherit cmake llvm toolchain-funcs desktop DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight" HOMEPAGE="https://github.com/WerWolv/ImHex"; SRC_URI=" - https://github.com/WerWolv/ImHex/releases/download/v${PV}/Full.Sources.tar.gz -> ${P}.tar.gz - https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${PV}.tar.gz -> ${PN}-patterns-${PV}.tar.gz + https://github.com/WerWolv/ImHex/releases/download/v${PV}/Full.Sources.tar.gz -> ${P}.gh.tar.gz + https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${PV}.tar.gz -> ${PN}-patterns-${PV}.gh.tar.gz " S="${WORKDIR}/ImHex" S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}" @@ -23,6 +23,10 @@ KEYWORDS="~amd64" IUSE="+system-llvm test lto" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}/remove_dotnet.patch" +) + DEPEND=" app-arch/zstd[zlib] app-forensics/yara @@ -69,17 +73,17 @@ src_configure() { -D IMHEX_IGNORE_BAD_COMPILER=OFF \ -D IMHEX_USE_GTK_FILE_PICKER=OFF \ -D IMHEX_DISABLE_STACKTRACE=ON \ - -D IMHEX_BUNDLE_DOTNET=ON \ - -D IMHEX_ENABLE_LTO=$(use lto) \ + -D IMHEX_BUNDLE_DOTNET=OFF \ + -D IMHEX_ENABLE_LTO=$(usex lto) \ -D IMHEX_USE_DEFAULT_BUILD_SETTINGS=OFF \ -D IMHEX_STRICT_WARNINGS=OFF \ - -D IMHEX_ENABLE_UNIT_TESTS=$(use test) \ + -D IMHEX_ENABLE_UNIT_TESTS=$(usex test) \ -D IMHEX_ENABLE_PRECOMPILED_HEADERS=OFF \ -D IMHEX_VERSION="${PV}" \ -D PROJECT_VERSION="${PV}" \ -D USE_SYSTEM_CAPSTONE=ON \ -D USE_SYSTEM_FMT=ON \ - -D USE_SYSTEM_LLVM=$(use system-llvm) \ + -D USE_SYSTEM_LLVM=$(usex system-llvm) \ -D USE_SYSTEM_NFD=ON \ -D USE_SYSTEM_NLOHMANN_JSON=ON \ -D USE_SYSTEM_YARA=ON
