diff options
| author | B Stack <bgstack15@gmail.com> | 2019-12-27 17:39:04 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-12-27 17:39:04 +0000 |
| commit | b40c382a3d80f83130fe011e99aee3b64c469c81 (patch) | |
| tree | bd720ccfbafe56fe614a349592e5a8dc3fe2829a /freefilesync/ffs_no_wx311.patch | |
| parent | Merge branch 'updates' into 'master' (diff) | |
| parent | fix ffs_el.patch serialize.h (diff) | |
| download | stackrpms-b40c382a3d80f83130fe011e99aee3b64c469c81.tar.gz stackrpms-b40c382a3d80f83130fe011e99aee3b64c469c81.tar.bz2 stackrpms-b40c382a3d80f83130fe011e99aee3b64c469c81.zip | |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 10.19
See merge request bgstack15/stackrpms!110
Diffstat (limited to 'freefilesync/ffs_no_wx311.patch')
| -rw-r--r-- | freefilesync/ffs_no_wx311.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index 92b5372..204740d 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -1,13 +1,12 @@ 2019-08-15 just compile. -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 @@ +diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp +--- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 07:56:06.714625467 -0500 ++++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 08:41:43.498308243 -0500 +@@ -1546,7 +1546,7 @@ //setMainInstructionFont(*m_staticTextMain); - m_bitmapActivation->SetBitmap(getResourceImage(L"website")); + m_bitmapActivation->SetBitmap(getResourceImage(L"internet")); - 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); |