diff options
| author | B Stack <bgstack15@gmail.com> | 2020-10-04 11:46:12 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-10-04 11:46:12 +0000 |
| commit | cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662 (patch) | |
| tree | 6e241f90b1671aaaf7e33145fc21eaea253c3735 /freefilesync/debian/patches/ffs_gcc.patch | |
| parent | Merge branch 'scite-bump' into 'master' (diff) | |
| parent | ffs 11.2 rpm for fedora (diff) | |
| download | stackrpms-cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662.tar.gz stackrpms-cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662.tar.bz2 stackrpms-cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.2
See merge request bgstack15/stackrpms!194
Diffstat (limited to 'freefilesync/debian/patches/ffs_gcc.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_gcc.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/freefilesync/debian/patches/ffs_gcc.patch b/freefilesync/debian/patches/ffs_gcc.patch index ed007b5..1f34404 100644 --- a/freefilesync/debian/patches/ffs_gcc.patch +++ b/freefilesync/debian/patches/ffs_gcc.patch @@ -1,13 +1,13 @@ -diff -Naur 10.25-1/FreeFileSync/Source/Makefile 10.25-2/FreeFileSync/Source/Makefile ---- 10.25-1/FreeFileSync/Source/Makefile 2020-06-20 13:36:08.495867672 -0400 -+++ 10.25-2/FreeFileSync/Source/Makefile 2020-06-20 13:31:36.180419862 -0400 +diff -aur 11.2-1/FreeFileSync/Source/Makefile 11.2-2/FreeFileSync/Source/Makefile +--- 11.2-1/FreeFileSync/Source/Makefile 2020-10-02 14:59:35.816639878 -0400 ++++ 11.2-2/FreeFileSync/Source/Makefile 2020-10-02 14:59:54.220866929 -0400 @@ -1,4 +1,5 @@ exeName = FreeFileSync +CXX=g++-10 cxxFlags += -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ - -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ -@@ -114,11 +115,11 @@ + -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ +@@ -115,11 +116,11 @@ ../Build/Bin/$(exeName): $(objFiles) mkdir -p $(dir $@) @@ -21,16 +21,16 @@ diff -Naur 10.25-1/FreeFileSync/Source/Makefile 10.25-2/FreeFileSync/Source/Make clean: rm -rf $(tmpPath) -diff -Naur 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile ---- 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:36:08.499867723 -0400 -+++ 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:31:48.844580205 -0400 +diff -aur 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile +--- 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-02 14:59:35.820639928 -0400 ++++ 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-02 14:59:54.220866929 -0400 @@ -1,4 +1,5 @@ exeName = RealTimeSync +CXX=g++-10 cxxFlags += -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ - -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ -@@ -52,11 +53,11 @@ + -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ +@@ -54,11 +55,11 @@ ../../Build/Bin/$(exeName): $(objFiles) mkdir -p $(dir $@) @@ -44,3 +44,4 @@ diff -Naur 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 10.25-2/FreeFileSyn clean: rm -rf $(tmpPath) + |