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/debian/patches/ffs_devuan.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/debian/patches/ffs_devuan.patch')
-rw-r--r-- | freefilesync/debian/patches/ffs_devuan.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch index 5e5af0b..e155745 100644 --- a/freefilesync/debian/patches/ffs_devuan.patch +++ b/freefilesync/debian/patches/ffs_devuan.patch @@ -15,9 +15,9 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou } -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/Makefile 10.24-1/FreeFileSync/Source/Makefile ---- 10.24-0/FreeFileSync/Source/Makefile 2020-05-17 11:01:12.813889858 -0400 -+++ 10.24-1/FreeFileSync/Source/Makefile 2020-05-17 11:29:01.456713486 -0400 +diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/Makefile 11.4-1/FreeFileSync/Source/Makefile +--- 11.4-0/FreeFileSync/Source/Makefile 2020-12-08 08:15:29.424156422 -0500 ++++ 11.4-1/FreeFileSync/Source/Makefile 2020-12-08 18:25:59.487867270 -0500 @@ -1,10 +1,10 @@ -exeName = FreeFileSync_$(shell arch) +exeName = FreeFileSync @@ -27,8 +27,8 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/Makefi -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 `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` @@ -44,9 +44,9 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou build += SPACED_BULLET; build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime())); -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/RealTimeSync/Makefile 10.24-1/FreeFileSync/Source/RealTimeSync/Makefile ---- 10.24-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-05-17 11:01:12.853890213 -0400 -+++ 10.24-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-05-17 11:29:17.540857423 -0400 +diff -Naur -x '*.orig' -x '*.rej' -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 08:15:29.424156422 -0500 ++++ 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-12-08 18:26:11.823997849 -0500 @@ -1,10 +1,10 @@ -exeName = RealTimeSync_$(shell arch) +exeName = RealTimeSync @@ -56,8 +56,9 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/RealTi -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 `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` + |