wyj/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2025-04-19 07:49:00 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

app-editors/imhex: Remove Werror, scrub patches

Browse Source 
Closes: https://bugs.gentoo.org/921663
Signed-off-by: Henri Gasc <gasc@eurecom.fr>
This commit is contained in:
Henri Gasc 2024-04-12 19:13:59 +02:00
parent 1525837f40
commit 06c7e828b2
No known key found for this signature in database
GPG Key ID: 3C21DC7CC460006B
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app-editors/imhex/files/remove_Werror.patch Normal file
View File

@ -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()

12
app-editors/imhex/files/remove_dotnet.patch
View File

@ -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 ()

2
app-editors/imhex/imhex-1.33.2.ebuild → app-editors/imhex/imhex-1.33.2-r1.ebuild
View File

@ -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="