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 52FA7158004 for ; Fri, 12 Apr 2024 19:59:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04E01E2A34; Fri, 12 Apr 2024 19:59:16 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8258E2A35 for ; Fri, 12 Apr 2024 19:59:15 +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 0441834336C for ; Fri, 12 Apr 2024 19:59:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64DCD16D1 for ; Fri, 12 Apr 2024 19:59:13 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1712942231.06c7e828b21868e0cd354ded91ec5e568dc868b4.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/imhex/, app-editors/imhex/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-editors/imhex/files/remove_Werror.patch app-editors/imhex/files/remove_dotnet.patch app-editors/imhex/imhex-1.33.2-r1.ebuild app-editors/imhex/imhex-1.33.2.ebuild X-VCS-Directories: app-editors/imhex/files/ app-editors/imhex/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 06c7e828b21868e0cd354ded91ec5e568dc868b4 X-VCS-Branch: master Date: Fri, 12 Apr 2024 19:59:13 +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: 2fc09518-130e-41f2-b3c9-c6557c2f0482 X-Archives-Hash: 47727169ad1d099058244b2c8cf4cb4d commit: 06c7e828b21868e0cd354ded91ec5e568dc868b4 Author: Henri Gasc eurecom fr> AuthorDate: Fri Apr 12 17:13:59 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Fri Apr 12 17:17:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=06c7e828 app-editors/imhex: Remove Werror, scrub patches Closes: https://bugs.gentoo.org/921663 Signed-off-by: Henri Gasc eurecom.fr> app-editors/imhex/files/remove_Werror.patch | 24 ++++++++++++++++++++++ app-editors/imhex/files/remove_dotnet.patch | 12 +++++------ ...{imhex-1.33.2.ebuild => imhex-1.33.2-r1.ebuild} | 2 ++ 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/app-editors/imhex/files/remove_Werror.patch b/app-editors/imhex/files/remove_Werror.patch new file mode 100644 index 0000000000..1a35f9e924 --- /dev/null +++ b/app-editors/imhex/files/remove_Werror.patch @@ -0,0 +1,24 @@ +Remove the different Werror flags we can find used +Should fix https://bugs.gentoo.org/921663 +--- a/lib/external/pattern_language/cli/CMakeLists.txt ++++ b/lib/external/pattern_language/cli/CMakeLists.txt +@@ -29,7 +29,7 @@ else() + find_package(CLI11 CONFIG QUIET) + endif() + +-target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds) ++target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds) + target_include_directories(plcli PUBLIC include ${CLI11_INCLUDE_DIRS}) + target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libpl libpl-gen ${FMT_LIBRARIES}) + +--- a/lib/external/pattern_language/lib/CMakeLists.txt ++++ b/lib/external/pattern_language/lib/CMakeLists.txt +@@ -86,7 +86,7 @@ if (LIBPL_ENABLE_PRECOMPILED_HEADERS) + endif () + + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +- target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds) ++ target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds) + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + target_compile_options(libpl PRIVATE -Wno-stringop-overflow) + endif() diff --git a/app-editors/imhex/files/remove_dotnet.patch b/app-editors/imhex/files/remove_dotnet.patch index 30ab50f642..88d5c9700d 100644 --- a/app-editors/imhex/files/remove_dotnet.patch +++ b/app-editors/imhex/files/remove_dotnet.patch @@ -1,14 +1,14 @@ -diff --git a/plugins/script_loader/CMakeLists.txt b/plugins/script_loader/CMakeLists.txt -index af0f6c79..cddc0e14 100644 +Remove the compilation step that needs dotnet +https://bugs.gentoo.org/926761 --- a/plugins/script_loader/CMakeLists.txt +++ b/plugins/script_loader/CMakeLists.txt -@@ -46,7 +46,4 @@ if (CoreClrEmbed_FOUND) +@@ -45,8 +45,4 @@ if (CoreClrEmbed_FOUND) + if (IMHEX_BUNDLE_DOTNET) install(FILES ${CoreClrEmbed_SHARED_LIBRARIES} DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif () - +- - add_subdirectory(dotnet) - add_dependencies(script_loader AssemblyLoader) - --endif () + endif () \ No newline at end of file -+endif () diff --git a/app-editors/imhex/imhex-1.33.2.ebuild b/app-editors/imhex/imhex-1.33.2-r1.ebuild similarity index 97% rename from app-editors/imhex/imhex-1.33.2.ebuild rename to app-editors/imhex/imhex-1.33.2-r1.ebuild index 046b7d8933..93f9baee0e 100644 --- a/app-editors/imhex/imhex-1.33.2.ebuild +++ b/app-editors/imhex/imhex-1.33.2-r1.ebuild @@ -25,6 +25,8 @@ PATCHES=( # will use it at some point and try to access internet. # Because it did not cause any issue, we can disable it "${FILESDIR}/remove_dotnet.patch" + # Remove the different -Werror flags + "${FILESDIR}/remove_Werror.patch" ) DEPEND="