freefilesync build 10.11 rpm on fedora

3 files changed, 84 insertions, 81 deletions

diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index 0763296..26c6077 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -1,9 +1,9 @@
 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
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/base/ffs_paths.cpp 10.9-1.el7/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.9-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1.el7/FreeFileSync/Source/base/ffs_paths.cpp	2019-02-17 10:43:22.286986341 -0500
+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
 @@ -59,7 +59,7 @@
      ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
  
@@ -13,14 +13,14 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/base/ffs
      //else //use OS' standard paths
      //    return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir()));
  }
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/Makefile 10.9-1.el7/FreeFileSync/Source/Makefile
---- 10.9-0/FreeFileSync/Source/Makefile	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1.el7/FreeFileSync/Source/Makefile	2019-02-17 10:50:27.282820639 -0500
+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
 @@ -1,10 +1,10 @@
 -EXENAME = FreeFileSync_$(shell arch)
 +EXENAME = FreeFileSync
  
- CXXFLAGS = -std=c++17 -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" \
             -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
@@ -30,14 +30,26 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/Makefile
  
  
  CXXFLAGS  += `pkg-config --cflags openssl`
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/RealTimeSync/Makefile 10.9-1.el7/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.9-0/FreeFileSync/Source/RealTimeSync/Makefile	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1.el7/FreeFileSync/Source/RealTimeSync/Makefile	2019-02-17 10:50:43.699007372 -0500
+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
+@@ -7,6 +7,8 @@
+ #ifndef APPLICATION_H_18506781708176342677
+ #define APPLICATION_H_18506781708176342677
+ 
++#define __GXX_ABI_VERSION 1002
++
+ #include <wx/app.h>
+ 
+ 
+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
 @@ -1,10 +1,10 @@
 -EXENAME = RealTimeSync_$(shell arch)
 +EXENAME = RealTimeSync
  
- CXXFLAGS = -std=c++17 -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" \
             -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
@@ -47,9 +59,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/RealTime
  
  #Gtk - support "no button border"
  CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.9-1.el7/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.9-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1.el7/FreeFileSync/Source/ui/small_dlgs.cpp	2019-02-17 10:42:29.741388638 -0500
+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
 @@ -115,6 +115,8 @@
          L" x64";
  #endif
@@ -59,9 +71,21 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/ui/small
  
      GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
  
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/zen/ring_buffer.h 10.9-1.el7/zen/ring_buffer.h
---- 10.9-0/zen/ring_buffer.h	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1.el7/zen/ring_buffer.h	2019-02-17 09:53:10.907818287 -0500
+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
+@@ -7,6 +7,8 @@
+ #ifndef APP_MAIN_H_08215601837818347575856
+ #define APP_MAIN_H_08215601837818347575856
+ 
++#define __GXX_ABI_VERSION 1002
++
+ #include <wx/window.h>
+ #include <wx/app.h>
+ 
+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
 @@ -9,6 +9,7 @@
  
  #include <cassert>
@@ -70,9 +94,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/zen/ring_buffer.h 10.9-1.el7
  
  
  namespace zen
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/zen/serialize.h 10.9-1.el7/zen/serialize.h
---- 10.9-0/zen/serialize.h	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1.el7/zen/serialize.h	2019-02-17 09:53:06.701772057 -0500
+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
 @@ -9,6 +9,7 @@
  
  #include <functional>
@@ -81,27 +105,3 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/zen/serialize.h 10.9-1.el7/z
  #include "string_base.h"
  //keep header clean from specific stream implementations! (e.g.file_io.h)! used by abstract.h!
  
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/wx+/app_main.h 10.9-1/wx+/app_main.h
---- 10.9-0/wx+/app_main.h	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1/wx+/app_main.h	2019-02-16 13:51:32.437266070 -0500
-@@ -7,6 +7,8 @@
- #ifndef APP_MAIN_H_08215601837818347575856
- #define APP_MAIN_H_08215601837818347575856
- 
-+#define __GXX_ABI_VERSION 1002
-+
- #include <wx/window.h>
- #include <wx/app.h>
- 
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.9-0/FreeFileSync/Source/RealTimeSync/application.h 10.9-1.el7/FreeFileSync/Source/RealTimeSync/application.h 
---- 10.9-0/FreeFileSync/Source/RealTimeSync/application.h	2019-02-13 16:05:15.000000000 -0500
-+++ 10.9-1.el7/FreeFileSync/Source/RealTimeSync/application.h	2019-02-18 08:53:14.017850931 -0500
-@@ -7,6 +7,8 @@
- #ifndef APPLICATION_H_18506781708176342677
- #define APPLICATION_H_18506781708176342677
- 
-+#define __GXX_ABI_VERSION 1002
-+
- #include <wx/app.h>
- 
- 
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch
index 02caceb..c1cf61e 100644
--- a/freefilesync/ffs_fedora.patch
+++ b/freefilesync/ffs_fedora.patch
@@ -1,20 +1,8 @@
 Upstream uses a libcurl more current than Fedora 29.
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-07 05:03:34.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-29 22:13:40.240595334 -0400
-@@ -106,6 +106,8 @@
-         L" x64";
- #endif
- 
-+    build +=
-+        L" for Fedora";
- 
-     GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
- 
-diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-13 06:58:40.771249592 -0500
-+++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-16 21:34:30.341077845 -0500
-@@ -66,7 +66,7 @@
+diff -Naur 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:27:24.421735762 -0400
+@@ -59,7 +59,7 @@
      ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
  
      //if (isPortableVersion())
@@ -23,14 +11,26 @@ diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Sou
      //else //use OS' standard paths
      //    return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir()));
  }
-diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/Makefile 10.9-1/FreeFileSync/Source/Makefile
---- 10.3-0/FreeFileSync/Source/Makefile	2019-02-10 22:01:42.138160180 -0500
-+++ 10.9-1/FreeFileSync/Source/Makefile	2019-02-11 21:48:19.729739859 -0500
+diff -Naur 10.11-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.11-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h
+--- 10.11-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h	2019-04-12 07:59:45.130151956 -0400
++++ 10.11-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h	2019-04-12 08:27:24.423735854 -0400
+@@ -75,7 +75,7 @@
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
++            //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
+diff -Naur 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:27:42.062542410 -0400
 @@ -1,10 +1,10 @@
 -EXENAME = FreeFileSync_$(shell arch)
 +EXENAME = FreeFileSync
  
- CXXFLAGS = -std=c++17 -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" \
             -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
             -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
  
@@ -39,14 +39,14 @@ diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/Makefile 10.9-1/Fre
  
  
  CXXFLAGS  += `pkg-config --cflags openssl`
-diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/RealTimeSync/Makefile 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile	2019-02-10 22:01:42.141160214 -0500
-+++ 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile	2019-02-11 21:48:22.504771344 -0500
+diff -Naur 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:29:23.857197105 -0400
 @@ -1,10 +1,10 @@
 -EXENAME = RealTimeSync_$(shell arch)
 +EXENAME = RealTimeSync
  
- CXXFLAGS = -std=c++17 -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" \
             -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
             -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
  
@@ -55,15 +55,15 @@ diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/RealTimeSync/Makefi
  
  #Gtk - support "no button border"
  CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h
---- 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h   2019-02-10 16:42:29.124040824 -0500
-+++ 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h   2019-02-10 20:57:30.758315345 -0500
-@@ -75,7 +75,7 @@
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
--            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
-+            //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
+diff -Naur 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:27:24.421735762 -0400
+@@ -115,6 +115,8 @@
+         L" x64";
+ #endif
+ 
++    build +=
++        L" for Fedora";
+ 
+     GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
+ 
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 642a8b5..7c45e91 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -14,7 +14,7 @@
    %define min_openssl >= 1.1.0h
 %endif
 Name:       freefilesync
-Version:    10.10
+Version:    10.11
 Release:    1%{?dist}
 Summary:    A file synchronization utility
 
@@ -182,6 +182,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
 
 %changelog
+* Fri Apr 12 2019 B Stack <bgstack15@gmail.com> - 10.11-1
+- version bump
+
 * Tue Feb 12 2019 B Stack <bgstack15@gmail.com> - 10.10-1
 - version bump
 - add libssh2 patch from AUR