summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_no_wx311.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-06-20 15:26:01 -0400
committerB Stack <bgstack15@gmail.com>2020-06-20 15:26:01 -0400
commitbe9c55eea9da9849722d90764ab9ef949ad14f8d (patch)
tree9d20ee1b2ea0869b1d009a3662b700d0f2093b0d /freefilesync/debian/patches/ffs_no_wx311.patch
parentMerge branch 'notepadpp-bump' into 'master' (diff)
downloadstackrpms-be9c55eea9da9849722d90764ab9ef949ad14f8d.tar.gz
stackrpms-be9c55eea9da9849722d90764ab9ef949ad14f8d.tar.bz2
stackrpms-be9c55eea9da9849722d90764ab9ef949ad14f8d.zip
freefilesync 10.25 dpkg rc1
now using g++-10 specifically
Diffstat (limited to 'freefilesync/debian/patches/ffs_no_wx311.patch')
-rw-r--r--freefilesync/debian/patches/ffs_no_wx311.patch18
1 files changed, 14 insertions, 4 deletions
diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch
index 932800d..926f7b8 100644
--- a/freefilesync/debian/patches/ffs_no_wx311.patch
+++ b/freefilesync/debian/patches/ffs_no_wx311.patch
@@ -1,8 +1,18 @@
2019-08-15 just compile.
-diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.24-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
-@@ -1594,7 +1594,7 @@
+diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-19 16:17:15.000000000 -0400
++++ 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-20 14:23:47.488836409 -0400
+@@ -293,7 +293,8 @@
+ {
+ showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
+ }
+- m_listBoxGdriveUsers->Append(gdriveAccounts);
++ for (const wxString& item : gdriveAccounts) // reverted to pre-wx 3.1.1 logic
++ m_listBoxGdriveUsers->Append(item);
+
+ //set default values for Google Drive: use first item of m_listBoxGdriveUsers
+ if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase))
+@@ -1663,7 +1664,7 @@
//setMainInstructionFont(*m_staticTextMain);
m_bitmapActivation->SetBitmap(getResourceImage("internet"));
bgstack15