diff options
| author | B Stack <bgstack15@gmail.com> | 2020-08-31 22:51:44 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-08-31 22:51:44 -0400 |
| commit | bef61ac53663379365601b5f369fc39122105219 (patch) | |
| tree | a240ea8ae405397c9a4ae8beaec68c68877ba316 /freefilesync/debian/patches/ffs_devuan_gtk3.patch | |
| parent | Merge branch 'connman-xdg-bump' into 'master' (diff) | |
| download | stackrpms-bef61ac53663379365601b5f369fc39122105219.tar.gz stackrpms-bef61ac53663379365601b5f369fc39122105219.tar.bz2 stackrpms-bef61ac53663379365601b5f369fc39122105219.zip | |
WIP: ffs 11.1
Does not compile yet, but this was just fixing all the fuzz.
Diffstat (limited to 'freefilesync/debian/patches/ffs_devuan_gtk3.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_devuan_gtk3.patch | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch index 16268d1..8a5e83e 100644 --- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch +++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch @@ -1,8 +1,7 @@ Author: B Stack Source: Original research -Date: 2020-03-18 -Message: Main patch to compile on Devuan using GTK3. BROKEN for FreeFileSync 10.21! -This reintroduces the gtk-3 usage, because Debian/Devuan stopped packaging libwxgtk3.0-dev (which used gtk2) and only does libwxgtk3.0-gtk3-dev. However, by reintroducing the gtk3, it brings back the old gtk3 instability from my previous packaging effort: https://freefilesync.org/forum/viewtopic.php?t=4918. /mnt/public/packages/old/freefilesync/freefilesync-9.7-1.master.tgz. Upstream never replied, but did note in the source that gtk3 is inherently unstable. +Date: 2020-08-31 +Message: Main patch to compile on Devuan using GTK3. diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile --- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 08:05:57.000000000 -0400 +++ 10.18-1/FreeFileSync/Source/Makefile 2019-11-21 09:42:57.408243242 -0500 @@ -35,15 +34,3 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/RealTi cppFiles= cppFiles+=application.cpp -diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1/wx+/dc.h ---- 10.18-0/wx+/dc.h 2019-11-21 08:24:23.967769384 -0500 -+++ 10.18-1/wx+/dc.h 2019-11-21 09:42:12.779786504 -0500 -@@ -54,7 +54,7 @@ - #ifdef wxHAVE_DPI_INDEPENDENT_PIXELS //pulled from wx/window.h: https://github.com/wxWidgets/wxWidgets/blob/master/include/wx/window.h#L2029 - return d; //e.g. macOS, GTK3 - #else //https://github.com/wxWidgets/wxWidgets/blob/master/src/common/wincmn.cpp#L2865 -- static_assert(GTK_MAJOR_VERSION == 2); -+ static_assert(GTK_MAJOR_VERSION == 3); - //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114 - //=> requires general fix at wxWidgets-level - assert(wxTheApp); //only call after wxWidgets was initalized! |