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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5FC8215812D for ; Mon, 30 Dec 2024 12:48:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6917DE05AC; Mon, 30 Dec 2024 12:48:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 1FA2AE05AC for ; Mon, 30 Dec 2024 12:48:11 +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 BCB4333BF08 for ; Mon, 30 Dec 2024 12:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 114B610E9 for ; Mon, 30 Dec 2024 12:48:09 +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: <1735562883.b13d5045dab6bd35cf65f4e34d62f7e15bfff3c2.gasc@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-editors/imhex/Manifest app-editors/imhex/imhex-1.35.4-r1.ebuild app-editors/imhex/imhex-1.36.2.ebuild X-VCS-Directories: app-editors/imhex/ X-VCS-Committer: gasc X-VCS-Committer-Name: Henri Gasc X-VCS-Revision: b13d5045dab6bd35cf65f4e34d62f7e15bfff3c2 X-VCS-Branch: dev Date: Mon, 30 Dec 2024 12:48:09 +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: a32345ea-622d-4a4e-89fc-b5f90e485bd8 X-Archives-Hash: 75a07d2dfb7194f9727227394ca6128b commit: b13d5045dab6bd35cf65f4e34d62f7e15bfff3c2 Author: Henri Gasc eurecom fr> AuthorDate: Mon Dec 30 12:47:53 2024 +0000 Commit: Henri Gasc eurecom fr> CommitDate: Mon Dec 30 12:48:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b13d5045 app-editors/imhex: add 1.36.2, drop 1.35.4-r1 Signed-off-by: Henri Gasc eurecom.fr> app-editors/imhex/Manifest | 4 +-- ...{imhex-1.35.4-r1.ebuild => imhex-1.36.2.ebuild} | 38 ++++++++++++++++------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest index a12c04ad1..f213b25da 100644 --- a/app-editors/imhex/Manifest +++ b/app-editors/imhex/Manifest @@ -1,2 +1,2 @@ -DIST imhex-1.35.4.gh.tar.gz 32738551 BLAKE2B 1e65a332a810af2884c6cf14dafa46cd2d09fc18891c48c7cb1007cab041b293e96db69db068b20d97fb5b51b16c3dbded38a679b65a8d7fd85ce705ae95d6d8 SHA512 a18215a76d949cd4bb7395c57965d1ca04fccad37142d130c17d3edbf8c383875a4f7e11ee3244aa4f08a5a512f19bd5e3e8ab3cdfb59603e7df142876c43318 -DIST imhex-patterns-1.35.4.gh.tar.gz 8212739 BLAKE2B ac79ed6bf919917323909b34f285d2bb48c2a1dadf9270ac09a41f627a07b726bd50751da00b6af1f7478c02c8e8de05d44f678840bf9aab377d96049e70d1fd SHA512 1af5818468eb0cf8d8078cd57d0659d93cf6d59380b3fc7e4cb07442ebc4f90e33e401516d1adafef65a696b458e1738984f92a5a5052a945a84422eda5a6bea +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 diff --git a/app-editors/imhex/imhex-1.35.4-r1.ebuild b/app-editors/imhex/imhex-1.36.2.ebuild similarity index 69% rename from app-editors/imhex/imhex-1.35.4-r1.ebuild rename to app-editors/imhex/imhex-1.36.2.ebuild index 6491b9d36..f8e2ee7d1 100644 --- a/app-editors/imhex/imhex-1.35.4-r1.ebuild +++ b/app-editors/imhex/imhex-1.36.2.ebuild @@ -3,9 +3,9 @@ EAPI=8 -LLVM_COMPAT=( {15..18} ) +LLVM_COMPAT=( {15..19} ) -inherit cmake llvm-r1 toolchain-funcs +inherit cmake llvm-r1 toolchain-funcs flag-o-matic xdg-utils DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight" HOMEPAGE="https://github.com/WerWolv/ImHex" @@ -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" RESTRICT="!test? ( test )" PATCHES=( @@ -38,8 +38,9 @@ DEPEND=" app-forensics/yara:= >=dev-cpp/nlohmann_json-3.10.2 dev-libs/capstone:= - >=dev-libs/nativefiledialog-extended-1.2.0:= + >=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 @@ -56,22 +57,26 @@ BDEPEND=" system-llvm? ( llvm-core/llvm ) app-admin/chrpath gnome-base/librsvg - desktop-portal? ( sys-apps/xdg-desktop-portal ) " pkg_pretend() { - if tc-is-gcc && [[ $(gcc-major-version) -lt 12 ]]; then - die "${PN} requires GCC 12 or newer" + if tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then + die "${PN} requires GCC 14 or newer" fi } src_unpack() { default - mv "${WORKDIR}/ImHex-Patterns-ImHex-v${PV}" "${S}/ImHex-Patterns" + mv "${S_PATTERNS}" "${S}/ImHex-Patterns" } src_configure() { + # Building ImHex with -Werror=strict-aliasing gives a failed build + # for tests/algorithms/source/endian.cpp, and ImHex usually has pretty + # clean build (without warnings), so it should be safe to do + filter-flags -Werror=strict-aliasing + if use test; then sed -ie "s/tests EXCLUDE_FROM_ALL/tests ALL/" "${S}/CMakeLists.txt" fi @@ -83,14 +88,18 @@ src_configure() { -D IMHEX_IGNORE_BAD_CLONE=ON \ -D IMHEX_PATTERNS_PULL_MASTER=OFF \ -D IMHEX_IGNORE_BAD_COMPILER=OFF \ - -D IMHEX_DISABLE_STACKTRACE=ON \ + -D IMHEX_USE_GTK_FILE_PICKER=$(usex !desktop-portal) \ + -D IMHEX_DISABLE_STACKTRACE=OFF \ -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_STATIC_LINK_PLUGINS=OFF \ + -D IMHEX_ENABLE_UNITY_BUILD=OFF \ + -D IMHEX_ENABLE_STD_ASSERTS=OFF \ -D IMHEX_ENABLE_UNIT_TESTS=$(usex test) \ -D IMHEX_ENABLE_PRECOMPILED_HEADERS=OFF \ - -D IMHEX_USE_GTK_FILE_PICKER=$(usex desktop-portal) \ + -D IMHEX_COMPRESS_DEBUG_INFO=OFF \ -D IMHEX_VERSION="${PV}" \ -D PROJECT_VERSION="${PV}" \ -D USE_SYSTEM_CAPSTONE=ON \ @@ -103,3 +112,12 @@ src_configure() { cmake_src_configure } + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +}