summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-06-27 14:38:48 -0400
committerB. Stack <bgstack15@gmail.com>2022-06-27 14:38:48 -0400
commit4ea154767d0b59c6c79bb444ae2a878361b85c83 (patch)
tree45e764ca267875d2cc0b84e3b0dfd8980a18ba2d
parentnpp 8.4.2 rc1 (diff)
downloadstackrpms-4ea154767d0b59c6c79bb444ae2a878361b85c83.tar.gz
stackrpms-4ea154767d0b59c6c79bb444ae2a878361b85c83.tar.bz2
stackrpms-4ea154767d0b59c6c79bb444ae2a878361b85c83.zip
ffs: fix dpkg r_z_a_u.patch
-rw-r--r--freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch10
1 files changed, 10 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
index ee34b5b..4758004 100644
--- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
@@ -379,3 +379,13 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+
{
wxMemoryDC dc(bmpSquare);
const wxColor borderCol(0xdd, 0xdd, 0xdd); //light grey
+--- 11.22-0/wx+/image_tools.cpp 2022-06-26 16:29:25.668035003 -0400
++++ 11.22-1/wx+/image_tools.cpp 2022-06-27 09:06:04.999244263 -0400
+@@ -188,7 +188,6 @@
+ return wxNullImage;
+
+ wxBitmap newBitmap(maxWidth, lineHeight * lineInfo.size()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+- newBitmap.SetScaleFactor(getDisplayScaleFactor());
+ {
+ dc.SelectObject(newBitmap); //copies scale factor from wxBitmap
+ ZEN_ON_SCOPE_EXIT(dc.SelectObject(wxNullBitmap));
bgstack15