summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-12-08 20:34:00 -0500
committerB Stack <bgstack15@gmail.com>2020-12-08 20:34:00 -0500
commitd19ffa817fd106a18c1f87a9ee43458eeb6d2c91 (patch)
treef70af6107de0cf6e1d82f3a5ae105d2c16900519 /freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
parentMerge branch 'palemoon-bump' into 'master' (diff)
downloadstackrpms-d19ffa817fd106a18c1f87a9ee43458eeb6d2c91.tar.gz
stackrpms-d19ffa817fd106a18c1f87a9ee43458eeb6d2c91.tar.bz2
stackrpms-d19ffa817fd106a18c1f87a9ee43458eeb6d2c91.zip
ffs dpkg 11.4, WIP ffs rpm
Diffstat (limited to 'freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch')
-rw-r--r--freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
index 1a468db..ad3f51e 100644
--- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
@@ -293,3 +293,15 @@ index e8ed01e4..2a9e00d2 100644
void showStatsPanel();
MainDialog& mainDlg_;
+diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+/no_flicker.h
+--- 11.4-1/wx+/no_flicker.h 2020-12-08 08:15:29.436156549 -0500
++++ 11.4-2/wx+/no_flicker.h 2020-12-08 20:11:25.066820270 -0500
+@@ -70,7 +70,7 @@
+ ZEN_ON_SCOPE_EXIT(richCtrl.EndSuppressUndo());
+
+ //fix mouse scroll speed: why the FUCK is this even necessary!
+- richCtrl.SetLineHeight(richCtrl.GetCharHeight());
++ //richCtrl.SetLineHeight(richCtrl.GetCharHeight()); // this is not even documented in wxWidgets 3.1.5!
+
+ //get rid of margins and space between text blocks/"paragraphs"
+ richCtrl.SetMargins({0, 0});
bgstack15