From f411b2edb3819c8328be3885ad71fd9c863775be Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 14 Feb 2019 18:20:14 +0000 Subject: FreeFileSync 10.9 rpm and dpkg --- freefilesync/debian/patches/devuan.patch | 24 -------- .../debian/patches/ffs_allow_parallel_ops.patch | 25 ++++++++ freefilesync/debian/patches/ffs_devuan.patch | 24 ++++++++ freefilesync/debian/patches/ffs_makefile.patch | 32 +++++++++++ .../debian/patches/ffs_no_check_updates.patch | 67 ++++++++++++++++++++++ freefilesync/debian/patches/ffs_no_wx311.patch | 44 ++++++++++++++ freefilesync/debian/patches/ffs_old_libcurl.patch | 13 +++++ freefilesync/debian/patches/ffs_sftp.patch | 17 ++++++ freefilesync/debian/patches/makefile.patch | 32 ----------- freefilesync/debian/patches/no_check_updates.patch | 57 ------------------ freefilesync/debian/patches/no_wx311.patch | 44 -------------- freefilesync/debian/patches/series | 12 ++-- 12 files changed, 229 insertions(+), 162 deletions(-) delete mode 100644 freefilesync/debian/patches/devuan.patch create mode 100644 freefilesync/debian/patches/ffs_allow_parallel_ops.patch create mode 100644 freefilesync/debian/patches/ffs_devuan.patch create mode 100644 freefilesync/debian/patches/ffs_makefile.patch create mode 100644 freefilesync/debian/patches/ffs_no_check_updates.patch create mode 100644 freefilesync/debian/patches/ffs_no_wx311.patch create mode 100644 freefilesync/debian/patches/ffs_old_libcurl.patch create mode 100644 freefilesync/debian/patches/ffs_sftp.patch delete mode 100644 freefilesync/debian/patches/makefile.patch delete mode 100644 freefilesync/debian/patches/no_check_updates.patch delete mode 100644 freefilesync/debian/patches/no_wx311.patch (limited to 'freefilesync/debian/patches') diff --git a/freefilesync/debian/patches/devuan.patch b/freefilesync/debian/patches/devuan.patch deleted file mode 100644 index abe5389..0000000 --- a/freefilesync/debian/patches/devuan.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-07 05:03:34.000000000 -0400 -+++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-29 22:13:40.240595334 -0400 -@@ -106,6 +106,8 @@ - L" x64"; - #endif - -+ build += -+ L" for Devuan"; - - GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() - -diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp ---- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 -+++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-16 21:34:30.341077845 -0500 -@@ -66,7 +66,7 @@ - ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName)); - - //if (isPortableVersion()) -- return appendSeparator(getExeFolderParentPath()); -+ return appendSeparator(getExeFolderParentPath()) + appendSeparator("share") + appendSeparator("FreeFileSync"); - //else //use OS' standard paths - // return appendSeparator(utfTo(wxStandardPathsBase::Get().GetResourcesDir())); - } diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch new file mode 100644 index 0000000..e464662 --- /dev/null +++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch @@ -0,0 +1,25 @@ +This is still experimental. +diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/folder_selector.cpp 10.9-1/FreeFileSync/Source/ui/folder_selector.cpp +--- 10.9-0/FreeFileSync/Source/ui/folder_selector.cpp 2019-02-10 16:42:28.960039117 -0500 ++++ 10.9-1/FreeFileSync/Source/ui/folder_selector.cpp 2019-02-10 20:20:11.981339625 -0500 +@@ -231,7 +231,7 @@ + + std::optional parallelOpsDisabledReason; + +- parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition"); ++ // parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition"); + + if (showCloudSetupDialog(parent_, folderPathPhrase, parallelOps, get(parallelOpsDisabledReason)) != ReturnSmallDlg::BUTTON_OKAY) + return; +diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/ui/sync_cfg.cpp 10.9-1/FreeFileSync/Source/ui/sync_cfg.cpp +--- 10.9-0/FreeFileSync/Source/ui/sync_cfg.cpp 2019-02-10 22:01:42.075159451 -0500 ++++ 10.9-1/FreeFileSync/Source/ui/sync_cfg.cpp 2019-02-11 21:25:11.685992654 -0500 +@@ -263,7 +263,7 @@ + globalPairCfg_(globalPairCfg), + localPairCfg_(localPairConfig), + showMultipleCfgs_(showMultipleCfgs), +-perfPanelActive_(false), ++perfPanelActive_(true), + commandHistItemsMax_(commandHistItemsMax) + { + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch new file mode 100644 index 0000000..ff840d7 --- /dev/null +++ b/freefilesync/debian/patches/ffs_devuan.patch @@ -0,0 +1,24 @@ +diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp +--- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-07 05:03:34.000000000 -0400 ++++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-29 22:13:40.240595334 -0400 +@@ -106,6 +106,8 @@ + L" x64"; + #endif + ++ build += ++ L" for Devuan"; + + GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() + +diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp +--- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 ++++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-16 21:34:30.341077845 -0500 +@@ -66,7 +66,7 @@ + ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName)); + + //if (isPortableVersion()) +- return appendSeparator(getExeFolderParentPath()); ++ return appendSeparator("/usr") + appendSeparator("share") + appendSeparator("freefilesync"); + //else //use OS' standard paths + // return appendSeparator(utfTo(wxStandardPathsBase::Get().GetResourcesDir())); + } diff --git a/freefilesync/debian/patches/ffs_makefile.patch b/freefilesync/debian/patches/ffs_makefile.patch new file mode 100644 index 0000000..79a8233 --- /dev/null +++ b/freefilesync/debian/patches/ffs_makefile.patch @@ -0,0 +1,32 @@ +diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/Makefile 10.9-1/FreeFileSync/Source/Makefile +--- 10.3-0/FreeFileSync/Source/Makefile 2019-02-10 22:01:42.138160180 -0500 ++++ 10.9-1/FreeFileSync/Source/Makefile 2019-02-11 21:48:19.729739859 -0500 +@@ -1,10 +1,10 @@ +-EXENAME = FreeFileSync_$(shell arch) ++EXENAME = FreeFileSync + + CXXFLAGS = -std=c++17 -pipe -DWXINTL_NO_GETTEXT_MACRO -DLIBSSH2_OPENSSL -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 + + + CXXFLAGS += `pkg-config --cflags openssl` +diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/RealTimeSync/Makefile 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile +--- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 2019-02-10 22:01:42.141160214 -0500 ++++ 10.9-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-02-11 21:48:22.504771344 -0500 +@@ -1,10 +1,10 @@ +-EXENAME = RealTimeSync_$(shell arch) ++EXENAME = RealTimeSync + + 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 + +-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` diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch new file mode 100644 index 0000000..3582b1d --- /dev/null +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -0,0 +1,67 @@ +diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp 10.9-1/FreeFileSync/Source/ui/main_dlg.cpp +--- 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp 2019-02-10 22:01:42.029158919 -0500 ++++ 10.9-1/FreeFileSync/Source/ui/main_dlg.cpp 2019-02-10 22:01:57.435336536 -0500 +@@ -5023,7 +5023,7 @@ + globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value! + + m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck)); +- ++ /* + if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) + { + flashStatusInformation(_("Searching for program updates...")); +@@ -5031,6 +5031,7 @@ + automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, + automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get()); + } ++ */ + } + + +@@ -5038,7 +5039,7 @@ + { + //execute just once per startup! + Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this); +- ++ /* + if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) + { + flashStatusInformation(_("Searching for program updates...")); +@@ -5052,6 +5053,7 @@ + resultAsync.get()); //run on main thread: + }); + } ++ */ + } + + +diff -x '*.swp' -x '*.orig' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/version_check.cpp 10.9-1/FreeFileSync/Source/ui/version_check.cpp +--- 10.9-0/FreeFileSync/Source/ui/version_check.cpp 2019-02-10 22:01:42.126160041 -0500 ++++ 10.9-1/FreeFileSync/Source/ui/version_check.cpp 2019-02-10 22:17:56.183369507 -0500 +@@ -69,6 +69,8 @@ + + bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) + { ++ // short-circuit ++ return false; + if (lastUpdateCheck == getVersionCheckInactiveId()) + return false; + +@@ -236,13 +238,13 @@ + const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError + lastOnlineVersion = onlineVersion; + +- if (haveNewerVersionOnline(onlineVersion)) +- showUpdateAvailableDialog(parent, onlineVersion); +- else ++ //if (haveNewerVersionOnline(onlineVersion)) ++ // showUpdateAvailableDialog(parent, onlineVersion); ++ //else + showNotificationDialog(parent, DialogInfoType::INFO, PopupDialogCfg(). + setIcon(getResourceImage(L"update_check")). + setTitle(_("Check for Program Updates")). +- setMainInstructions(_("FreeFileSync is up to date."))); ++ setMainInstructions(_("Use your package manager for any updates to FreeFileSync."))); + } + catch (const zen::SysError& e) + { diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch new file mode 100644 index 0000000..78ac2a5 --- /dev/null +++ b/freefilesync/debian/patches/ffs_no_wx311.patch @@ -0,0 +1,44 @@ +diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp +--- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-07 05:03:34.000000000 -0400 ++++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-08 19:16:54.026727623 -0400 +@@ -984,7 +984,8 @@ + //setMainInstructionFont(*m_staticTextMain); + + m_bitmapActivation->SetBitmap(getResourceImage(L"website")); +- m_textCtrlOfflineActivationKey->ForceUpper(); ++ // Fedora 27 does not have wxWidgets 3.1.1 yet. https://github.com/wxWidgets/wxWidgets/commit/69b66e9e2e2b8e49e3816acdde079686ce9b0da1 ++ //m_textCtrlOfflineActivationKey->ForceUpper(); + + m_textCtrlLastError ->ChangeValue(lastErrorMsg); + m_textCtrlManualActivationUrl ->ChangeValue(manualActivationUrl); +diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp +--- 10.3-0/wx+/grid.cpp 2018-08-07 05:03:34.000000000 -0400 ++++ 10.3-2/wx+/grid.cpp 2018-08-08 19:24:56.849445102 -0400 +@@ -1176,7 +1176,9 @@ + { + if (overlapPix != 0) + { +- const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec] ++ // Fedora 28 does not have wxGTK 3.1.1 yet. This probably breaks HiDPI usage ++ //const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec] ++ const double scrollSpeed = overlapPix * mouseDragSpeedIncScrollU; //unit: [scroll units / sec] + toScroll += scrollSpeed * deltaSecs; + } + else +diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp +--- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 ++++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-14 21:39:14.715702415 -0500 +@@ -85,8 +85,11 @@ + else //OS standard path (XDG layout): ~/.config/FreeFileSync + { + //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag +- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); +- cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; ++ ++ // Fedora 28 does not have wxGTK 3.1.1 yet. ++ // So subsitute a hard-coded name instead of requesting file layout of XDG ++ //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); ++ cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo(".config")) + "FreeFileSync"; + } + + #ifdef __GNUC__ diff --git a/freefilesync/debian/patches/ffs_old_libcurl.patch b/freefilesync/debian/patches/ffs_old_libcurl.patch new file mode 100644 index 0000000..e13f1bb --- /dev/null +++ b/freefilesync/debian/patches/ffs_old_libcurl.patch @@ -0,0 +1,13 @@ +Upstream uses a libcurl more current than Fedora 29. +diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h +--- 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 16:42:29.124040824 -0500 ++++ 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 20:57:30.758315345 -0500 +@@ -75,7 +75,7 @@ + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50); +- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); ++ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND); diff --git a/freefilesync/debian/patches/ffs_sftp.patch b/freefilesync/debian/patches/ffs_sftp.patch new file mode 100644 index 0000000..34dc9ad --- /dev/null +++ b/freefilesync/debian/patches/ffs_sftp.patch @@ -0,0 +1,17 @@ +diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/sftp.cpp 10.9-1/FreeFileSync/Source/fs/sftp.cpp +--- 10.9-0/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 16:42:29.139040980 -0500 ++++ 10.9-1/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 21:28:00.030732089 -0500 +@@ -56,9 +56,10 @@ + + //attention: if operation fails due to time out, e.g. file copy, the cleanup code may hang, too => total delay = 2 x time out interval + +-const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ = 4 * MAX_SFTP_READ_SIZE; //https://github.com/libssh2/libssh2/issues/90 +-const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 4 * MAX_SFTP_OUTGOING_SIZE; // +-static_assert(MAX_SFTP_READ_SIZE == 30000 && MAX_SFTP_OUTGOING_SIZE == 30000, "reevaluate optimal block sizes if these constants change!"); ++// these values are all manually derived from https://github.com/libssh2/libssh2/blob/master/src/sftp.h which for some weak reason are not included in the libssh2-devel headers. ++const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ = 4 * 30000; //https://github.com/libssh2/libssh2/issues/90 ++const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 4 * 30000; // ++//static_assert(MAX_SFTP_READ_SIZE == 30000 && MAX_SFTP_OUTGOING_SIZE == 30000, "reevaluate optimal block sizes if these constants change!"); + /* + Perf Test, Sourceforge frs, SFTP upload, compressed 25 MB test file: + diff --git a/freefilesync/debian/patches/makefile.patch b/freefilesync/debian/patches/makefile.patch deleted file mode 100644 index b3ff7ff..0000000 --- a/freefilesync/debian/patches/makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/Makefile 10.3-2/FreeFileSync/Source/Makefile ---- 10.3-0/FreeFileSync/Source/Makefile 2018-08-07 05:03:33.000000000 -0400 -+++ 10.3-2/FreeFileSync/Source/Makefile 2018-08-15 22:25:06.694355202 -0400 -@@ -9,7 +9,7 @@ - -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 - - #Gtk - support recycler/icon loading/no button border/grid scrolling - CXXFLAGS += `pkg-config --cflags gtk+-2.0` -@@ -101,6 +101,7 @@ - all: ../Build/Bin/$(APPNAME) - - ../Build/Bin/$(APPNAME): $(OBJ_FILES) -+ mkdir -p ../Build/Bin - g++ -o $@ $^ $(LINKFLAGS) - - ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : % -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile ---- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-07 05:03:33.000000000 -0400 -+++ 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-15 22:25:15.968461418 -0400 -@@ -6,7 +6,7 @@ - -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 - - #Gtk - support "no button border" - CXXFLAGS += `pkg-config --cflags gtk+-2.0` diff --git a/freefilesync/debian/patches/no_check_updates.patch b/freefilesync/debian/patches/no_check_updates.patch deleted file mode 100644 index 99f0c8f..0000000 --- a/freefilesync/debian/patches/no_check_updates.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 10.3-2/FreeFileSync/Source/ui/main_dlg.cpp ---- 10.3-0/FreeFileSync/Source/ui/main_dlg.cpp 2018-08-07 05:03:34.000000000 -0400 -+++ 10.3-2/FreeFileSync/Source/ui/main_dlg.cpp 2018-08-08 18:50:50.455078387 -0400 -@@ -5004,7 +5004,7 @@ - globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value! - - m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck)); -- -+ /* - if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) - { - flashStatusInformation(_("Searching for program updates...")); -@@ -5012,6 +5012,7 @@ - automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, - automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get()); - } -+ */ - } - - -@@ -5019,7 +5020,7 @@ - { - //execute just once per startup! - Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this); -- -+ /* - if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) - { - flashStatusInformation(_("Searching for program updates...")); -@@ -5033,6 +5034,7 @@ - resultAsync.get()); //run on main thread: - }); - } -+ */ - } - - -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/version_check_impl.h 10.3-2/FreeFileSync/Source/ui/version_check_impl.h ---- 10.3-0/FreeFileSync/Source/ui/version_check_impl.h 2018-08-07 05:03:34.000000000 -0400 -+++ 10.3-2/FreeFileSync/Source/ui/version_check_impl.h 2018-08-08 18:50:50.458078415 -0400 -@@ -14,7 +14,7 @@ - - namespace fff - { --inline -+ - time_t getVersionCheckInactiveId() - { - //use current version to calculate a changing number for the inactive state near UTC begin, in order to always check for updates after installing a new version -@@ -38,7 +38,6 @@ - } - - --inline - time_t getVersionCheckCurrentTime() - { - return std::time(nullptr); diff --git a/freefilesync/debian/patches/no_wx311.patch b/freefilesync/debian/patches/no_wx311.patch deleted file mode 100644 index 78ac2a5..0000000 --- a/freefilesync/debian/patches/no_wx311.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-07 05:03:34.000000000 -0400 -+++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-08 19:16:54.026727623 -0400 -@@ -984,7 +984,8 @@ - //setMainInstructionFont(*m_staticTextMain); - - m_bitmapActivation->SetBitmap(getResourceImage(L"website")); -- m_textCtrlOfflineActivationKey->ForceUpper(); -+ // Fedora 27 does not have wxWidgets 3.1.1 yet. https://github.com/wxWidgets/wxWidgets/commit/69b66e9e2e2b8e49e3816acdde079686ce9b0da1 -+ //m_textCtrlOfflineActivationKey->ForceUpper(); - - m_textCtrlLastError ->ChangeValue(lastErrorMsg); - m_textCtrlManualActivationUrl ->ChangeValue(manualActivationUrl); -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp ---- 10.3-0/wx+/grid.cpp 2018-08-07 05:03:34.000000000 -0400 -+++ 10.3-2/wx+/grid.cpp 2018-08-08 19:24:56.849445102 -0400 -@@ -1176,7 +1176,9 @@ - { - if (overlapPix != 0) - { -- const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec] -+ // Fedora 28 does not have wxGTK 3.1.1 yet. This probably breaks HiDPI usage -+ //const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec] -+ const double scrollSpeed = overlapPix * mouseDragSpeedIncScrollU; //unit: [scroll units / sec] - toScroll += scrollSpeed * deltaSecs; - } - else -diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp ---- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 -+++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-14 21:39:14.715702415 -0500 -@@ -85,8 +85,11 @@ - else //OS standard path (XDG layout): ~/.config/FreeFileSync - { - //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag -- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); -- cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; -+ -+ // Fedora 28 does not have wxGTK 3.1.1 yet. -+ // So subsitute a hard-coded name instead of requesting file layout of XDG -+ //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); -+ cfgFolderPath = appendSeparator(utfTo(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo(".config")) + "FreeFileSync"; - } - - #ifdef __GNUC__ diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series index d430762..2dbed63 100644 --- a/freefilesync/debian/patches/series +++ b/freefilesync/debian/patches/series @@ -1,5 +1,7 @@ -# You must remove unused comment lines for the released package. -no_check_updates.patch -devuan.patch -no_wx311.patch -makefile.patch +ffs_allow_parallel_ops.patch +ffs_devuan.patch +ffs_makefile.patch +ffs_no_check_updates.patch +ffs_no_wx311.patch +ffs_old_libcurl.patch +ffs_sftp.patch -- cgit