diff options
| author | B Stack <bgstack15@gmail.com> | 2020-05-21 03:11:11 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-05-21 03:11:11 +0000 |
| commit | 3ecfbfaf641478dc1b84099f417cff764671a209 (patch) | |
| tree | 7cacb13c6a30f2513ff55dc5743f7f1ccb50388a /freefilesync/ffs_fedora.patch | |
| parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
| parent | fix whitespace for no_eraseif patch (diff) | |
| download | stackrpms-3ecfbfaf641478dc1b84099f417cff764671a209.tar.gz stackrpms-3ecfbfaf641478dc1b84099f417cff764671a209.tar.bz2 stackrpms-3ecfbfaf641478dc1b84099f417cff764671a209.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.24
See merge request bgstack15/stackrpms!158
Diffstat (limited to 'freefilesync/ffs_fedora.patch')
| -rw-r--r-- | freefilesync/ffs_fedora.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index a82ccad..82787ea 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -15,45 +15,45 @@ diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Make --- 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 +-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" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ -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 --debug=no` -pthread ++linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread - CXXFLAGS += `pkg-config --cflags openssl` -@@ -17,6 +17,7 @@ CXXFLAGS += `pkg-config --cflags libssh2` - LINKFLAGS += `pkg-config --libs libssh2` + 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` + 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 + 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.15-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-08-15 13:59:53.934551753 -0400 @@ -1,13 +1,14 @@ --EXENAME = RealTimeSync_$(shell arch) -+EXENAME = RealTimeSync +-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" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ -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 --debug=no` -pthread ++linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread #Gtk - support "no button border" - CXXFLAGS += `pkg-config --cflags gtk+-2.0` -+LINKFLAGS += `pkg-config --libs gtk+-2.0` + 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 + cxxFlags += -isystem/usr/include/gtk-2.0 diff -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 --- 10.22-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:49:57.837901137 -0400 @@ -62,7 +62,7 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou build += L"64 Bit"; #endif -+ build += L" for Devuan"; ++ build += L" for Fedora"; + build += SPACED_BULLET; build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime())); |