From 8303df38956fc971a236a2c7fc776a8da2f6ab54 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 22 Oct 2019 09:37:03 -0400 Subject: WIP: freefilesync 10.17 rpm rc1 Attempt at updating the patches for 10.17. Need to try with libcurl 7.66.0 which my local install does not have. --- freefilesync/ffs_el.patch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'freefilesync/ffs_el.patch') diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index 1e75f1c..05d8dd6 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -10,7 +10,7 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S Zstring fff::getResourceDirPf() { - return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR; -+ // For Fedora/EL, install to /usr/share/freefilesync specificly ++ // For Fedora, EL and Devuan, install to /usr/share/freefilesync specificly + return Zstr("/usr/share/freefilesync/"); } @@ -22,8 +22,8 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefil -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" \ +-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 @@ -75,6 +75,14 @@ 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 -- cgit From ee0f89a752197d8f7d0387ef102548e9a87f858a Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 22 Oct 2019 11:02:57 -0400 Subject: WIP: ffs el patch --- freefilesync/ffs_el.patch | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'freefilesync/ffs_el.patch') 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 #include +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 -- cgit From 7d4b22aebbdf074592288daba85c1a1dae626875 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 22 Oct 2019 11:41:32 -0400 Subject: WIP: fix el patch --- freefilesync/ffs_el.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'freefilesync/ffs_el.patch') diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index f029be8..5365636 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -112,8 +112,8 @@ 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 @@ ++++ 10.17-1/zen/build_info.h 2019-10-22 11:40:19.873435707 -0400 +@@ -24,7 +24,7 @@ constexpr bool usingLittleEndian() { -- cgit From 1240098e4905fc5fdf54740709873bed5137f7eb Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 22 Oct 2019 13:56:22 -0400 Subject: WIP: test a separate patch for the include --- freefilesync/ffs_el.patch | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'freefilesync/ffs_el.patch') diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index 5365636..b25c74e 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -107,21 +107,6 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/ #include #include -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 11:40:19.873435707 -0400 -@@ -24,7 +24,7 @@ - - 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 -- cgit From 5698f851f2b147e05aa9693cfc8d5f6e1e451635 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 23 Oct 2019 09:55:53 -0400 Subject: freefilesync: el7 use c++2a now Thanks to devtoolset-8, el7 can now compile against -std=c++2a --- freefilesync/ffs_el.patch | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'freefilesync/ffs_el.patch') diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index b25c74e..3e1e9d3 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -21,17 +21,16 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefil @@ -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++17 -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 + -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` @@ -69,7 +68,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim +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" \ ++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 + -O3 -DNDEBUG -fPIC `wx-config --version=3.0 --cxxflags --debug=no` -pthread -- cgit