diff options
author | B Stack <bgstack15@gmail.com> | 2020-12-10 12:28:18 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-12-10 12:28:18 +0000 |
commit | 95d1c5485ea21247f0311ea646e17965170766e8 (patch) | |
tree | a5ad6d0ca55c3915d2ae29e65c6b1cffbf9d57fd /freefilesync/ffs_fedora.patch | |
parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
parent | ffs rpm 11.4 (diff) | |
download | stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.tar.gz stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.tar.bz2 stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.zip |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 11.4
See merge request bgstack15/stackrpms!206
Diffstat (limited to 'freefilesync/ffs_fedora.patch')
-rw-r--r-- | freefilesync/ffs_fedora.patch | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index 5c5fda0..1396c91 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -1,4 +1,4 @@ -Last modified date: 2020-10-03 +Last modified date: 2020-12-08 History: ffs_fedora 2020-07-22 now uses gtk3 diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source/ffs_paths.cpp --- 10.13-0/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400 @@ -13,19 +13,20 @@ diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source } -diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Source/Makefile 11.0-1/FreeFileSync/Source/Makefile ---- 11.0-0/FreeFileSync/Source/Makefile 2020-07-22 11:36:55.000000000 -0400 -+++ 11.0-1/FreeFileSync/Source/Makefile 2020-07-22 13:36:27.193345688 -0400 +diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefile 11.4-1/FreeFileSync/Source/Makefile +--- 11.4-0/FreeFileSync/Source/Makefile 2020-12-08 20:49:38.675976861 -0500 ++++ 11.4-1/FreeFileSync/Source/Makefile 2020-12-08 21:01:57.174590803 -0500 @@ -1,10 +1,10 @@ -exeName = FreeFileSync_$(shell arch) +exeName = FreeFileSync - 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++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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread --linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread -+linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread +-linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread ++linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread cxxFlags += `pkg-config --cflags openssl` @@ -42,19 +43,20 @@ diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Sour #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) -diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Source/RealTimeSync/Makefile 11.0-1/FreeFileSync/Source/RealTimeSync/Makefile ---- 11.0-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-07-22 11:36:55.000000000 -0400 -+++ 11.0-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-07-22 13:36:32.262394424 -0400 +diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile +--- 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-12-08 20:49:38.675976861 -0500 ++++ 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-12-08 21:01:19.720188711 -0500 @@ -1,15 +1,16 @@ -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++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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread --linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread -+linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread +-linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread ++linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread #Gtk - support "no button border" -cxxFlags += `pkg-config --cflags gtk+-2.0` @@ -66,7 +68,7 @@ diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Sour cppFiles= cppFiles+=application.cpp -iff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp +diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp --- 10.22-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:49:57.837901137 -0400 +++ 10.22-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:51:50.381251257 -0400 @@ -97,6 +97,8 @@ |