freefilesync build 10.11 rpm on el7

1 files changed, 13 insertions, 10 deletions

diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index 26c6077..a64c21f 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -1,9 +1,10 @@
 The cstddef discovery is from https://stackoverflow.com/questions/52567517/freefilesync-c-error-byte-is-not-a-member-of-std
 Some changes just make the application work better in an installed setting (e.g., the hard-coded resouce path).
 Tricking the wxWidgets ABI version comes from https://stackoverflow.com/questions/45123664/wxwidgets-runtime-error-mismatch-version/47822976#47822976
+FreeFileSync 10.11 updated the default compile flags to -std=c++2a, but this fails on gcc 4.8.5 on el7. Reverting to -std=c++17 allows the application to compile.
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp
 --- 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-04-12 07:59:45.368162920 -0400
-+++ 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-04-12 08:37:16.173065808 -0400
++++ 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-04-12 10:19:57.226913391 -0400
 @@ -59,7 +59,7 @@
      ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
  
@@ -15,12 +16,13 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/base/ff
  }
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Makefile
 --- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 07:59:45.042147902 -0400
-+++ 10.11-1/FreeFileSync/Source/Makefile	2019-04-12 08:41:35.552373673 -0400
++++ 10.11-1/FreeFileSync/Source/Makefile	2019-04-12 10:21:04.341525635 -0400
 @@ -1,10 +1,10 @@
 -EXENAME = FreeFileSync_$(shell arch)
 +EXENAME = FreeFileSync
  
- CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -DLIBSSH2_OPENSSL -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+-CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -DLIBSSH2_OPENSSL -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
++CXXFLAGS = -std=c++17 -pipe -DWXINTL_NO_GETTEXT_MACRO -DLIBSSH2_OPENSSL -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 \
 -           -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
 +           -O3 -DNDEBUG -fPIC `wx-config --version=3.0 --cxxflags --debug=no` -pthread
@@ -32,7 +34,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefil
  CXXFLAGS  += `pkg-config --cflags openssl`
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTimeSync/application.h 10.11-1/FreeFileSync/Source/RealTimeSync/application.h
 --- 10.11-0/FreeFileSync/Source/RealTimeSync/application.h	2019-04-12 07:59:45.035147580 -0400
-+++ 10.11-1/FreeFileSync/Source/RealTimeSync/application.h	2019-04-12 08:37:16.176065950 -0400
++++ 10.11-1/FreeFileSync/Source/RealTimeSync/application.h	2019-04-12 10:19:57.227913415 -0400
 @@ -7,6 +7,8 @@
  #ifndef APPLICATION_H_18506781708176342677
  #define APPLICATION_H_18506781708176342677
@@ -44,12 +46,13 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim
  
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile
 --- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile	2019-04-12 07:59:45.008146336 -0400
-+++ 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile	2019-04-12 08:41:41.348652126 -0400
++++ 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile	2019-04-12 10:20:57.076351109 -0400
 @@ -1,10 +1,10 @@
 -EXENAME = RealTimeSync_$(shell arch)
 +EXENAME = RealTimeSync
  
- CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+-CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
++CXXFLAGS = -std=c++17 -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 \
 -           -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
 +           -O3 -DNDEBUG -fPIC `wx-config --version=3.0 --cxxflags --debug=no` -pthread
@@ -61,7 +64,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim
  CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp
 --- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-04-12 07:59:45.318160616 -0400
-+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-04-12 08:37:16.175065903 -0400
++++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-04-12 10:19:57.228913439 -0400
 @@ -115,6 +115,8 @@
          L" x64";
  #endif
@@ -73,7 +76,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/ui/smal
  
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/app_main.h
 --- 10.11-0/wx+/app_main.h	2019-04-12 07:59:44.936143019 -0400
-+++ 10.11-1/wx+/app_main.h	2019-04-12 08:37:16.176065950 -0400
++++ 10.11-1/wx+/app_main.h	2019-04-12 10:19:57.228913439 -0400
 @@ -7,6 +7,8 @@
  #ifndef APP_MAIN_H_08215601837818347575856
  #define APP_MAIN_H_08215601837818347575856
@@ -85,7 +88,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/
  
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/ring_buffer.h 10.11-1/zen/ring_buffer.h
 --- 10.11-0/zen/ring_buffer.h	2019-04-12 07:59:46.098196548 -0400
-+++ 10.11-1/zen/ring_buffer.h	2019-04-12 08:37:16.175065903 -0400
++++ 10.11-1/zen/ring_buffer.h	2019-04-12 10:19:57.228913439 -0400
 @@ -9,6 +9,7 @@
  
  #include <cassert>
@@ -96,7 +99,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/ring_buffer.h 10.11-1/z
  namespace zen
 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/serialize.h 10.11-1/zen/serialize.h
 --- 10.11-0/zen/serialize.h	2019-04-12 07:59:46.080195719 -0400
-+++ 10.11-1/zen/serialize.h	2019-04-12 08:37:16.175065903 -0400
++++ 10.11-1/zen/serialize.h	2019-04-12 10:19:57.229913463 -0400
 @@ -9,6 +9,7 @@
  
  #include <functional>