summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_no_wx311.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-02-14 18:20:14 +0000
committerB Stack <bgstack15@gmail.com>2019-02-14 18:20:14 +0000
commit899f8baa296bb3ebcb2a79d52113c1ddd643a08a (patch)
tree324a06c40b35c1ee785077e0a3c67b31d3a75e9e /freefilesync/debian/patches/ffs_no_wx311.patch
parentpm-ublock dpkg for devuan (diff)
parentFreeFileSync 10.9 rpm and dpkg (diff)
downloadstackrpms-899f8baa296bb3ebcb2a79d52113c1ddd643a08a.tar.gz
stackrpms-899f8baa296bb3ebcb2a79d52113c1ddd643a08a.tar.bz2
stackrpms-899f8baa296bb3ebcb2a79d52113c1ddd643a08a.zip
FreeFileSync 10.9 rpm and dpkg
Application changes * Added FTP, SFTP, Google Drive support for Linux * FreeFileSync Donation Edition available for Linux * Compress file stream during Google Drive upload * Navigate beyond access-denied parents in SFTP folder picker * Fixed unexpected stream size error during FTP upload * Support native recursive deletion for Google Drive * Support native recursive deletion for MTP * Deterministically save Google Drive state during exit * Work around missing TMPDIR variable (Linux) * Support SFTP servers returning large package sizes during folder reading * Start with home path when using SFTP folder picker * Aggregate device authentication prompts during comparison * Clean up temp file after unexpected stream size error * Work around FTP servers not supporting HELP command * Support parsing path by volume name when volume is missing * Parse and streamline Google Drive error messages * Load next item after deleting from config history * Avoid redundant Google Drive syncs after file/folder creation * Avoid duplicate MTP item creation by multiple threads Package changes * Upstream removed Makefile install target, so each package implements basically identical, local install targets * Added patches for older versions of dependencies which do not alter basic usage of the application See merge request bgstack15/stackrpms!37
Diffstat (limited to 'freefilesync/debian/patches/ffs_no_wx311.patch')
-rw-r--r--freefilesync/debian/patches/ffs_no_wx311.patch44
1 files changed, 44 insertions, 0 deletions
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<Zstring>(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<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
+ }
+
+ #ifdef __GNUC__
bgstack15