From d5afedbc9a17a8f7f21c1fc7d32f65bafb80d8e9 Mon Sep 17 00:00:00 2001 From: roku Date: Sun, 23 Feb 2025 15:08:36 +0100 Subject: [PATCH] app-editors/imhex: update patches --- app-editors/imhex/files/remove_Werror.patch | 29 +++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/app-editors/imhex/files/remove_Werror.patch b/app-editors/imhex/files/remove_Werror.patch index cfd65aa..8df9742 100644 --- a/app-editors/imhex/files/remove_Werror.patch +++ b/app-editors/imhex/files/remove_Werror.patch @@ -1,25 +1,26 @@ -Remove -Werror where we can not control it using flags -https://bugs.gentoo.org/921663 -Submodule lib/external/pattern_language contains modified content +diff --git a/lib/external/pattern_language/cli/CMakeLists.txt b/lib/external/pattern_language/cli/CMakeLists.txt +index 163eded..fcf7dd2 100644 --- 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) +@@ -32,7 +32,7 @@ else() 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) + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +- 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) + endif() target_include_directories(plcli PUBLIC include ${CLI11_INCLUDE_DIRS}) - target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libpl libpl-gen ${FMT_LIBRARIES}) - + target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libwolv libpl_includes libpl-gen ${FMT_LIBRARIES}) +diff --git a/lib/external/pattern_language/lib/CMakeLists.txt b/lib/external/pattern_language/lib/CMakeLists.txt +index 29cbf1e..415eff4 100644 --- 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") +@@ -90,7 +90,7 @@ endif () + if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + target_compile_options(libpl PRIVATE /EHsc) + elseif (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") + if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") target_compile_options(libpl PRIVATE -Wno-stringop-overflow) endif()