[neon/extras/exiv2/Neon/unstable] debian/patches: dos line endings are go
Jonathan Riddell
null at kde.org
Mon Nov 23 12:45:35 GMT 2020
Git commit 0c88927ace139337162ae6781e429717fbec8c26 by Jonathan Riddell.
Committed on 23/11/2020 at 12:45.
Pushed by jriddell into branch 'Neon/unstable'.
dos line endings are go
M +8 -8 debian/patches/neon_fcf-protection.diff
https://invent.kde.org/neon/extras/exiv2/commit/0c88927ace139337162ae6781e429717fbec8c26
diff --git a/debian/patches/neon_fcf-protection.diff b/debian/patches/neon_fcf-protection.diff
index b43ed3d9..01212cb1 100644
--- a/debian/patches/neon_fcf-protection.diff
+++ b/debian/patches/neon_fcf-protection.diff
@@ -3,11 +3,11 @@ Index: exiv2-0.27.3/cmake/compilerFlags.cmake
--- exiv2-0.27.3.orig/cmake/compilerFlags.cmake
+++ exiv2-0.27.3/cmake/compilerFlags.cmake
@@ -26,7 +26,7 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Li
- # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
- if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
- if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
-- add_compile_options(-fstack-clash-protection -fcf-protection)
-+ add_compile_options(-fstack-clash-protection)
- endif()
-
- if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8
+ # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
+ if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
+ if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
+- add_compile_options(-fstack-clash-protection -fcf-protection)
++ add_compile_options(-fstack-clash-protection)
+ endif()
+
+ if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8
More information about the Neon-commits
mailing list