diff options
| author | B Stack <bgstack15@gmail.com> | 2019-02-02 01:51:22 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-02-02 01:51:22 +0000 |
| commit | 3c02a73c7f94cf91635b4ff736501e3d52265838 (patch) | |
| tree | 47b224ccd882ec12a932ad77732704ea082eed65 /freefilesync/debian/patches/no_wx311.patch | |
| parent | add palemoon dpkg for devuan (diff) | |
| parent | add freefilesync dpkg rough draft (diff) | |
| download | stackrpms-3c02a73c7f94cf91635b4ff736501e3d52265838.tar.gz stackrpms-3c02a73c7f94cf91635b4ff736501e3d52265838.tar.bz2 stackrpms-3c02a73c7f94cf91635b4ff736501e3d52265838.zip | |
Merge branch 'freefilesync-dpkg' into 'master'
freefilesync dpkg for devuan
See merge request bgstack15/stackrpms!33
Diffstat (limited to 'freefilesync/debian/patches/no_wx311.patch')
| -rw-r--r-- | freefilesync/debian/patches/no_wx311.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/no_wx311.patch b/freefilesync/debian/patches/no_wx311.patch new file mode 100644 index 0000000..78ac2a5 --- /dev/null +++ b/freefilesync/debian/patches/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__ |