summaryrefslogtreecommitdiff
path: root/freefilesync
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-10-22 11:02:57 -0400
committerB Stack <bgstack15@gmail.com>2019-10-22 11:02:57 -0400
commitee0f89a752197d8f7d0387ef102548e9a87f858a (patch)
tree572cc7d23ebf7312ad6061ac3ce8dfacc1ba7dcf /freefilesync
parentWIP: freefilesync 10.17 rpm rc1 (diff)
downloadstackrpms-ee0f89a752197d8f7d0387ef102548e9a87f858a.tar.gz
stackrpms-ee0f89a752197d8f7d0387ef102548e9a87f858a.tar.bz2
stackrpms-ee0f89a752197d8f7d0387ef102548e9a87f858a.zip
WIP: ffs el patch
Diffstat (limited to 'freefilesync')
-rw-r--r--freefilesync/ffs_el.patch31
1 files changed, 23 insertions, 8 deletions
diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index 05d8dd6..f029be8 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -41,6 +41,14 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefil
#treat as system headers so that warnings are hidden:
CXXFLAGS += -isystem/usr/include/gtk-2.0
+@@ -56,7 +56,6 @@
+ CPP_FILES+=afs/init_curl_libssh2.cpp
+ CPP_FILES+=afs/native.cpp
+ CPP_FILES+=afs/sftp.cpp
+-CPP_FILES+=afs/libssh2/init_libssh2.cpp
+ CPP_FILES+=ui/batch_config.cpp
+ CPP_FILES+=ui/abstract_folder_picker.cpp
+ CPP_FILES+=ui/batch_status_handler.cpp
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
@@ -75,14 +83,6 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim
#treat as system headers so that warnings are hidden:
CXXFLAGS += -isystem/usr/include/gtk-2.0
-@@ -56,7 +56,6 @@
- CPP_FILES+=afs/init_curl_libssh2.cpp
- CPP_FILES+=afs/native.cpp
- CPP_FILES+=afs/sftp.cpp
--CPP_FILES+=afs/libssh2/init_libssh2.cpp
- CPP_FILES+=ui/batch_config.cpp
- CPP_FILES+=ui/abstract_folder_picker.cpp
- CPP_FILES+=ui/batch_status_handler.cpp
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
@@ -107,6 +107,21 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/
#include <wx/window.h>
#include <wx/app.h>
+Version: FreeFileSync 10.17
+Distro: EL7,EL8,fc29
+Message: short-circuit for EL and Fedora 29. This probably has to do with gcc < 9. Conveniently, x86 and x86_64 are my only targets and they are little-endian.
+diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.17-0/zen/build_info.h 10.17-1/zen/build_info.h
+--- 10.17-0/zen/build_info.h 2019-10-21 11:23:51.249139703 -0400
++++ 10.17-1/zen/build_info.h 2019-10-22 10:52:41.846538926 -0400
+@@ -24,7 +24,9 @@
+
+ constexpr bool usingLittleEndian()
+ {
+- return std::endian::native == std::endian::little;
++ return true;
+ }
+
+ #endif //BUILD_INFO_H_5928539285603428657
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 10:19:57.228913439 -0400
bgstack15