From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 525A5158089 for ; Mon, 9 Oct 2023 15:39:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B79B2BC01E; Mon, 9 Oct 2023 15:39:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 731122BC01E for ; Mon, 9 Oct 2023 15:39:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E41CE335C5D for ; Mon, 9 Oct 2023 15:38:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3308AF16 for ; Mon, 9 Oct 2023 15:38:58 +0000 (UTC) From: "Henri Gasc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Henri Gasc" Message-ID: <1696865935.c169e2e8f87bb192603e2cbee910290d81caae26.gasc@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-editors/imhex/Manifest app-editors/imhex/files/llvm-16.patch app-editors/imhex/imhex-1.30.1.ebuild app-editors/imhex/imhex-1.31.0.ebuild app-editors/imhex/metadata.xml X-VCS-Directories: app-editors/imhex/ app-editors/imhex/files/ X-VCS-Committer: gasc X-VCS-Committer-Name: Henri Gasc X-VCS-Revision: c169e2e8f87bb192603e2cbee910290d81caae26 X-VCS-Branch: dev Date: Mon, 9 Oct 2023 15:38:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e04a4f39-7a09-4ae2-b205-b00b48c07052 X-Archives-Hash: eb1578a77f439ed32347da45034033d7 commit: c169e2e8f87bb192603e2cbee910290d81caae26 Author: Henri Gasc eurecom fr> AuthorDate: Mon Oct 9 15:37:25 2023 +0000 Commit: Henri Gasc eurecom fr> CommitDate: Mon Oct 9 15:38:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c169e2e8 app-editors/imhex: add 1.31.0, drop 1.30.1 Closes: https://bugs.gentoo.org/915471 Closes: https://bugs.gentoo.org/909290 Closes: https://bugs.gentoo.org/909291 Signed-off-by: Henri Gasc eurecom.fr> app-editors/imhex/Manifest | 4 +-- app-editors/imhex/files/llvm-16.patch | 13 ++++++++++ .../{imhex-1.30.1.ebuild => imhex-1.31.0.ebuild} | 29 +++++++++------------- app-editors/imhex/metadata.xml | 3 +++ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest index 0d45767258..5765ebdb4c 100644 --- a/app-editors/imhex/Manifest +++ b/app-editors/imhex/Manifest @@ -1,2 +1,2 @@ -DIST imhex-1.30.1.tar.gz 25920970 BLAKE2B 03a651134bda5814dc4e989a763f148b3a03694640d1baaa4be6e075ad9c5e798959bc477484f8214423e15836cc01de033e10606ee04dc375521101b4c75f13 SHA512 04c71f15fdbe17443b0f98cef2c2562b7d360f14065e4fab2c2dc1eaf9bbd0d8aa9a267dd1eab208d77cf00622edf6b5126b2d266b817f301a2281aae82eed45 -DIST imhex-patterns-1.30.1.tar.gz 3377742 BLAKE2B 4fa9475f7b04f5765f0a81258e9d01bf814b7b7a0b318c096fdc3ba728938f3f782c9c30fde7ced79626b70b550649d883eda6cf5bbc4b3d8d3a9ad8ac1c5364 SHA512 d734c7fe1c31c9b7845422047a9b9d1289c432cfe98d2b08ca5fe22b82262e3ae41ec14e93d3c62d24c87294fcdf439719cef6bc2ee5b2b54b45377addb9f06a +DIST imhex-1.31.0.tar.gz 25062606 BLAKE2B 9db337f5aa54ccefd925175f8b4869ece873a7c466d6ddded88c26d6f4fd7ba73a7789964ad2ae6a902d2ec653980ef2482434ddcbbbc224aaac8906b16e92c5 SHA512 483a89e84746ba74eb968f84140ae52edb7046d1074160a97eb6ebad6eac0284beccaf39004141cbe1eebcd8ca92d1fd486c45790880503bbcc40c7bdd586cb8 +DIST imhex-patterns-1.31.0.tar.gz 4448476 BLAKE2B 0bace799f0d2280ccd11a1fcafa9d22620a74691f6b5622d3ad0e260143792c8239158ba021de8e775d5d8589f6dfee990d25beab4288c053d9a5b138b8cc252 SHA512 aaeb2028bbc8235fb49ba75bdca71acf725da0035395c86df97c3976bb70f33ad34f9ce3089d72141de6767cc511c575cc3ac85b66ee4eeba8caa252fc874dba diff --git a/app-editors/imhex/files/llvm-16.patch b/app-editors/imhex/files/llvm-16.patch new file mode 100644 index 0000000000..5c7efa5faa --- /dev/null +++ b/app-editors/imhex/files/llvm-16.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake +index 624e401..cfd30c3 100644 +--- a/cmake/build_helpers.cmake ++++ b/cmake/build_helpers.cmake +@@ -503,7 +503,7 @@ macro(addBundledLibraries) + add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL) + set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON) + else() +- find_package(LLVM REQUIRED Demangle) ++ find_package(LLVM 16 REQUIRED Demangle) + endif() + + if (NOT USE_SYSTEM_YARA) diff --git a/app-editors/imhex/imhex-1.30.1.ebuild b/app-editors/imhex/imhex-1.31.0.ebuild similarity index 79% rename from app-editors/imhex/imhex-1.30.1.ebuild rename to app-editors/imhex/imhex-1.31.0.ebuild index 1ea5d0cef7..ccbb9ef59a 100644 --- a/app-editors/imhex/imhex-1.30.1.ebuild +++ b/app-editors/imhex/imhex-1.31.0.ebuild @@ -6,7 +6,7 @@ EAPI=8 CMAKE_BUILD_TYPE="Release" CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake llvm toolchain-funcs +inherit cmake llvm toolchain-funcs desktop DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight" HOMEPAGE="https://github.com/WerWolv/ImHex" @@ -20,6 +20,11 @@ S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" +IUSE="+system-llvm" + +PATCHES=( + "${FILESDIR}/llvm-16.patch" +) DEPEND=" app-forensics/yara @@ -41,6 +46,7 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" + system-llvm? ( https://github.com/WerWolv/ImHex/issues WerWolv/ImHex + + Use the system LLVM installation + Features