summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_devuan_gtk3.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-07-22 13:21:06 -0400
committerB Stack <bgstack15@gmail.com>2020-07-22 13:21:06 -0400
commitaf7f721978339986754e0ac3b0c1944a4fcc3aca (patch)
treee7672a0c15c08d0cd9ce7f5b9699d95c7ba417f6 /freefilesync/debian/patches/ffs_devuan_gtk3.patch
parentMerge branch 'irfanview-bump' into 'master' (diff)
downloadstackrpms-af7f721978339986754e0ac3b0c1944a4fcc3aca.tar.gz
stackrpms-af7f721978339986754e0ac3b0c1944a4fcc3aca.tar.bz2
stackrpms-af7f721978339986754e0ac3b0c1944a4fcc3aca.zip
ffs 11.0 dpkg rc1
Upstream now says it works with gtk3! So we have dropped gtk2 patches for devuan.
Diffstat (limited to 'freefilesync/debian/patches/ffs_devuan_gtk3.patch')
-rw-r--r--freefilesync/debian/patches/ffs_devuan_gtk3.patch12
1 files changed, 0 insertions, 12 deletions
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 3559261..16268d1 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -47,15 +47,3 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1
//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!
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/icon_loader.cpp 10.18-1/FreeFileSync/Source/base/icon_loader.cpp
---- 10.18-0/FreeFileSync/Source/base/icon_loader.cpp 2019-11-21 08:24:23.955769262 -0500
-+++ 10.18-1/FreeFileSync/Source/base/icon_loader.cpp 2019-11-21 09:42:15.439813730 -0500
-@@ -18,7 +18,7 @@
-
- namespace
- {
--static_assert(GTK_MAJOR_VERSION == 2, "FreeFileSync does NOT (currently) support GTK3! The GTK calls below will lead to crashes due to not being thread-safe on GTK3.");
-+static_assert(GTK_MAJOR_VERSION == 3, "FreeFileSync does NOT (currently) support GTK3! The GTK calls below will lead to crashes due to not being thread-safe on GTK3.");
- //gdk_threads_enter(); + ZEN_ON_SCOPE_EXIT(::gdk_threads_leave); is NOT enough; e.g. GTK3 + openSuse still crashes with:
- // Gtk:ERROR:gtkicontheme.c:4026:proxy_pixbuf_destroy: assertion failed: (icon_info->proxy_pixbuf != NULL)
- //GTK icon theme internals: https://github.com/GNOME/gtk/blob/master/gtk/gtkicontheme.c
bgstack15