From ac5906af4a9ca75df51b91e01a926474878828ba Mon Sep 17 00:00:00 2001 From: Henri Gasc Date: Sun, 19 Oct 2025 12:48:59 +0200 Subject: [PATCH] app-editors/imhex: remove Werror and limit capstone version Signed-off-by: Henri Gasc --- .../files/imhex-1.37.4-remove-Werror.patch | 33 +++++++++++++++++++ app-editors/imhex/imhex-1.37.4-r4.ebuild | 3 ++ 2 files changed, 36 insertions(+) create mode 100644 app-editors/imhex/files/imhex-1.37.4-remove-Werror.patch diff --git a/app-editors/imhex/files/imhex-1.37.4-remove-Werror.patch b/app-editors/imhex/files/imhex-1.37.4-remove-Werror.patch new file mode 100644 index 0000000000..d835473c7d --- /dev/null +++ b/app-editors/imhex/files/imhex-1.37.4-remove-Werror.patch @@ -0,0 +1,33 @@ +--- a/lib/external/disassembler/lib/CMakeLists.txt ++++ b/lib/external/disassembler/lib/CMakeLists.txt +@@ -14,5 +14,5 @@ target_include_directories(libdisassembler PUBLIC include) + target_link_libraries(libdisassembler PRIVATE wolv::types wolv::utils wolv::io wolv::math_eval ${NLOHMANN_JSON_LIBRARIES} ${FMT_LIBRARIES}) + + if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +- target_compile_options(libdisassembler PRIVATE -Wall -Wextra -Wpedantic -Werror) +-endif() +\ No newline at end of file ++ target_compile_options(libdisassembler PRIVATE -Wall -Wextra -Wpedantic) ++endif() +--- a/lib/external/pattern_language/cli/CMakeLists.txt ++++ b/lib/external/pattern_language/cli/CMakeLists.txt +@@ -32,7 +32,7 @@ else() + endif() + + 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} libwolv libpl_includes libpl-gen ${FMT_LIBRARIES}) +--- a/lib/external/pattern_language/lib/CMakeLists.txt ++++ b/lib/external/pattern_language/lib/CMakeLists.txt +@@ -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") + target_compile_options(libpl PRIVATE -Wno-stringop-overflow) + endif() diff --git a/app-editors/imhex/imhex-1.37.4-r4.ebuild b/app-editors/imhex/imhex-1.37.4-r4.ebuild index 65a0c6175d..213cd896db 100644 --- a/app-editors/imhex/imhex-1.37.4-r4.ebuild +++ b/app-editors/imhex/imhex-1.37.4-r4.ebuild @@ -39,6 +39,8 @@ PATCHES=( "${FILESDIR}/${P}-update-libfmt.patch" # Temporary patch (until the next update) "${FILESDIR}/${P}-fix-cmake-edlib.patch" + # Remove the -Werror flag + "${FILESDIR}/${P}-remove-Werror.patch" ) DOCS+=( LICENSE PLUGINS.md ) @@ -51,6 +53,7 @@ DEPEND=" >=dev-cpp/nlohmann_json-3.10.2 dev-libs/boost >=dev-libs/capstone-5.0.3:= + =dev-libs/nativefiledialog-extended-1.2.1[desktop-portal?] >=dev-libs/libfmt-11.0.2:= media-libs/fontconfig