From f7491e9d517e16973ab33f80789c9964d764a361 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 4 Jan 2021 08:43:21 -0500 Subject: ffs 11.5-1 rc1 The patches only needed fixes for fuzz, and not any refactoring! --- .../debian/patches/revert_zenju_aggressive_upstreamisms.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch') diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch index ad3f51e..9492e33 100644 --- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch @@ -156,11 +156,11 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu { SetLabel(label); diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/dc.h 11.1-2/wx+/dc.h ---- 11.1-1/wx+/dc.h 2020-09-01 19:09:33.652448178 -0400 -+++ 11.1-2/wx+/dc.h 2020-09-01 20:08:43.183988180 -0400 +--- 11.5-0/wx+/dc.h 2021-01-04 08:07:48.384544469 -0500 ++++ 11.5-1/wx+/dc.h 2021-01-04 08:13:41.316314485 -0500 @@ -68,9 +68,6 @@ inline - int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) + int fastFromDIP(double d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) { -#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS -#error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined? -- cgit