diff options
| author | B Stack <bgstack15@gmail.com> | 2021-02-02 23:59:22 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-02-02 23:59:22 +0000 |
| commit | 020db28c7559db43c26cba54c1b0f47c675ec906 (patch) | |
| tree | 38d238404dded6a8855a3731564aeda60df033cf /freefilesync/revert_zenju_aggressive_upstreamisms.patch | |
| parent | Merge branch 'waterfox-bump' into 'master' (diff) | |
| parent | fix icon source to zip file (diff) | |
| download | stackrpms-020db28c7559db43c26cba54c1b0f47c675ec906.tar.gz stackrpms-020db28c7559db43c26cba54c1b0f47c675ec906.tar.bz2 stackrpms-020db28c7559db43c26cba54c1b0f47c675ec906.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.6
See merge request bgstack15/stackrpms!215
Diffstat (limited to 'freefilesync/revert_zenju_aggressive_upstreamisms.patch')
| -rw-r--r-- | freefilesync/revert_zenju_aggressive_upstreamisms.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch index 9492e33..37a1b18 100644 --- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/revert_zenju_aggressive_upstreamisms.patch @@ -155,12 +155,12 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu wxBitmapButton(parent, id, wxNullBitmap, pos, size, style, validator, name) { SetLabel(label); -diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/dc.h 11.1-2/wx+/dc.h ---- 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 +diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/wx+/dc.h +--- 11.6-0/wx+/dc.h 2021-02-02 11:37:38.777718874 -0500 ++++ 11.6-1/wx+/dc.h 2021-02-02 13:05:02.297177154 -0500 @@ -68,9 +68,6 @@ inline - int fastFromDIP(double d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) + int fastFromDIP(int 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? |