freefilesync 10.15 rpm rc1

5 files changed, 72 insertions, 15 deletions

diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index 644dfcb..1e75f1c 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -17,22 +17,30 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S
  
 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 10:21:04.341525635 -0400
++++ 10.15-1/FreeFileSync/Source/Makefile        2019-08-16 08:19:12.101271747 -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++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
- 
+
 -LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
 +LINKFLAGS = -s -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,-z,relro  -no-pie `wx-config --version=3.0 --libs std, aui --debug=no | sed -r -e 's/-[^[:space:]]+web[^[:space:]]+//;'` -lz -pthread
- 
- 
+
+
  CXXFLAGS  += `pkg-config --cflags openssl`
+@@ -17,6 +17,7 @@
+ LINKFLAGS += `pkg-config --libs   libssh2`
+
+ CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
++LINKFLAGS += `pkg-config --libs   gtk+-2.0`
+ #treat as system headers so that warnings are hidden:
+ CXXFLAGS  += -isystem/usr/include/gtk-2.0
+
 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 10:19:57.227913415 -0400
@@ -47,22 +55,26 @@ 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 10:20:57.076351109 -0400
-@@ -1,10 +1,10 @@
++++ 10.15-1/FreeFileSync/Source/RealTimeSync/Makefile   2019-08-16 08:19:21.959638104 -0400
+@@ -1,13 +1,14 @@
 -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++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
- 
+
 -LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
 +LINKFLAGS = -s -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -no-pie `wx-config --version=3.0 --cxxflags --libs std, aui --debug=no | sed -r -e 's/-[^[:space:]]+web[^[:space:]]+//;'` -lz -pthread
- 
+
  #Gtk - support "no button border"
  CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
++LINKFLAGS += `pkg-config --libs   gtk+-2.0`
+ #treat as system headers so that warnings are hidden:
+ CXXFLAGS  += -isystem/usr/include/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 10:19:57.228913439 -0400
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch
index dc91530..3355299 100644
--- a/freefilesync/ffs_fedora.patch
+++ b/freefilesync/ffs_fedora.patch
@@ -40,10 +40,18 @@ diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Make
  
  
  CXXFLAGS  += `pkg-config --cflags openssl`
+@@ -17,6 +17,7 @@ CXXFLAGS  += `pkg-config --cflags libssh2`
+ LINKFLAGS += `pkg-config --libs   libssh2`
+
+ CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
++LINKFLAGS += `pkg-config --libs   gtk+-2.0`
+ #treat as system headers so that warnings are hidden:
+ CXXFLAGS  += -isystem/usr/include/gtk-2.0
+
 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 @@
++++ 10.15-1/FreeFileSync/Source/RealTimeSync/Makefile	2019-08-15 13:59:53.934551753 -0400
+@@ -1,13 +1,14 @@
 -EXENAME = RealTimeSync_$(shell arch)
 +EXENAME = RealTimeSync
  
@@ -56,6 +64,10 @@ diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSyn
  
  #Gtk - support "no button border"
  CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
++LINKFLAGS += `pkg-config --libs   gtk+-2.0`
+ #treat as system headers so that warnings are hidden:
+ CXXFLAGS  += -isystem/usr/include/gtk-2.0
+ 
 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
diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch
index c11bf3a..4e56d19 100644
--- a/freefilesync/ffs_no_check_updates.patch
+++ b/freefilesync/ffs_no_check_updates.patch
@@ -77,7 +77,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
 +        //if (haveNewerVersionOnline(onlineVersion))
 +        //    showUpdateAvailableDialog(parent, onlineVersion);
 +        //else
-             showNotificationDialog(parent, DialogInfoType::INFO, PopupDialogCfg().
+             showNotificationDialog(parent, DialogInfoType::info, PopupDialogCfg().
                                     setIcon(getResourceImage(L"update_check")).
                                     setTitle(_("Check for Program Updates")).
 -                                   setMainInstructions(_("FreeFileSync is up to date.")));
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch
index a1ff0e4..e6069d4 100644
--- a/freefilesync/ffs_no_wx311.patch
+++ b/freefilesync/ffs_no_wx311.patch
@@ -1,3 +1,4 @@
+2019-08-15 just compile. 
 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-08 19:16:54.026727623 -0400
@@ -40,3 +41,32 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S
  
  
      std::call_once(onceFlagCreateCfgPath, [&]
+diff --git a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp
+index 6e769bb..ce6110b 100644
+--- a/FreeFileSync/Source/ui/command_box.cpp
++++ b/FreeFileSync/Source/ui/command_box.cpp
+@@ -130,7 +130,9 @@ void CommandBox::setValueAndUpdateList(const wxString& value)
+
+     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
+     wxItemContainer::Clear(); //suffices to clear the selection items only!
+-    this->Append(items);
++    for (const wxString& item : items)
++        this->Append(item);
++
+
+     //this->SetSelection(wxNOT_FOUND); //don't select anything
+     ChangeValue(value); //preserve main text!
+diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp
+index 2b824b1..a17ea2f 100644
+--- a/FreeFileSync/Source/ui/folder_history_box.cpp
++++ b/FreeFileSync/Source/ui/folder_history_box.cpp
+@@ -90,7 +90,8 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase)
+
+     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
+     wxItemContainer::Clear(); //suffices to clear the selection items only!
+-    this->Append(dirList);
++    for (const wxString& dir : dirList)
++        this->Append(dir);
+
+     //this->SetSelection(wxNOT_FOUND); //don't select anything
+     ChangeValue(folderPathPhrase); //preserve main text!
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 4a961b9..7bcd683 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -14,8 +14,8 @@
    %define min_openssl >= 1.1.1c
 %endif
 Name:       freefilesync
-Version:    10.14
-Release:    3%{?dist}
+Version:    10.15
+Release:    1%{?dist}
 Summary:    A file synchronization utility
 
 Group:      Applications/File
@@ -190,6 +190,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
 
 %changelog
+* Thu Aug 15 2019 B Stack <bgstack15@gmail.com> - 10.15-1
+- version bump
+
 * Tue Jul 16 2019 B Stack <bgstack15@gmail.com> - 10.14-3
 - completely disable update-check