diff options
Diffstat (limited to '0001-makepkg-Fix-compiler-check.patch')
| -rw-r--r-- | 0001-makepkg-Fix-compiler-check.patch | 68 |
1 files changed, 60 insertions, 8 deletions
diff --git a/0001-makepkg-Fix-compiler-check.patch b/0001-makepkg-Fix-compiler-check.patch index a122c4d42a0a..6a870a396317 100644 --- a/0001-makepkg-Fix-compiler-check.patch +++ b/0001-makepkg-Fix-compiler-check.patch @@ -1,30 +1,82 @@ -From e408912623c2eb4c945a0b75f3caffaffa971371 Mon Sep 17 00:00:00 2001 +From 935af505d61e4f7e2324cd34833d24e6f789e61a Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Mon, 14 Nov 2022 11:58:59 +0100 Subject: [PATCH] makepkg: Fix compiler check --- - cmake/build_helpers.cmake | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) + cmake/build_helpers.cmake | 23 +++++++++++++---------- + 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake -index 13a08ecc..e9d7770a 100644 +index 0227511b..048e350c 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake -@@ -383,8 +383,11 @@ function(downloadImHexPatternsFiles dest) +@@ -238,27 +238,27 @@ macro(createPackage) + elseif(UNIX AND NOT APPLE) + + set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION}) +- ++ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dist/DEBIAN/control.in ${CMAKE_BINARY_DIR}/DEBIAN/control) +- ++ + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}/share/licenses/imhex) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png) + install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}" PERMISSIONS ${LIBRARY_PERMISSIONS}) + downloadImHexPatternsFiles("./share/imhex") +- ++ + # install AppStream file + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/net.werwolv.imhex.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) +- ++ + # install symlink for the old standard name + file(CREATE_LINK net.werwolv.imhex.metainfo.xml ${CMAKE_CURRENT_BINARY_DIR}/net.werwolv.imhex.appdata.xml SYMBOLIC) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/net.werwolv.imhex.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) + + endif() +- ++ + if (CREATE_BUNDLE) + include(PostprocessBundle) +- ++ + set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION}) + + set_property(TARGET main PROPERTY MACOSX_BUNDLE_INFO_PLIST ${MACOSX_BUNDLE_INFO_PLIST}) +@@ -271,7 +271,7 @@ macro(createPackage) + add_custom_target(build-time-make-resources-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${IMHEX_BUNDLE_PATH}/Contents/Resources") + + downloadImHexPatternsFiles("${IMHEX_BUNDLE_PATH}/Contents/MacOS") +- ++ + install(FILES ${IMHEX_ICON} DESTINATION "${IMHEX_BUNDLE_PATH}/Contents/Resources") + install(TARGETS main BUNDLE DESTINATION ".") + install(FILES $<TARGET_FILE:main> DESTINATION "${IMHEX_BUNDLE_PATH}") +@@ -391,8 +391,11 @@ function(downloadImHexPatternsFiles dest) endfunction() macro(setupCompilerWarnings target) - set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror") -- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow") +- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds") + set(IMHEX_C_FLAGS "") + + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -+ set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow") ++ set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds") + endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IMHEX_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMHEX_C_FLAGS}") +@@ -406,7 +409,7 @@ macro(setUninstallTarget) + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) +- ++ + add_custom_target(uninstall + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) + endif() -- -2.39.1 +2.40.0 |