summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_fedora.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-07-23 14:24:41 +0000
committerB Stack <bgstack15@gmail.com>2020-07-23 14:24:41 +0000
commit6182a3a1a339fdbc882c30a01e25c1db7ad7728c (patch)
treef7f50de0ac3c85e16687014bd7ad37babe75861d /freefilesync/ffs_fedora.patch
parentMerge branch 'irfanview-bump' into 'master' (diff)
parentfix date for 10.25 (diff)
downloadstackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.tar.gz
stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.tar.bz2
stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.zip
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.0 See merge request bgstack15/stackrpms!169
Diffstat (limited to 'freefilesync/ffs_fedora.patch')
-rw-r--r--freefilesync/ffs_fedora.patch56
1 files changed, 39 insertions, 17 deletions
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch
index 82787ea..f804660 100644
--- a/freefilesync/ffs_fedora.patch
+++ b/freefilesync/ffs_fedora.patch
@@ -1,3 +1,4 @@
+ffs_fedora 2020-07-22 now uses gtk3
diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source/ffs_paths.cpp
--- 10.13-0/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400
+++ 10.13-1/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:36:28.178274292 -0400
@@ -11,9 +12,9 @@ diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source
}
-diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Makefile
---- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 07:59:45.042147902 -0400
-+++ 10.11-1/FreeFileSync/Source/Makefile 2019-04-12 08:27:42.062542410 -0400
+diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Source/Makefile 11.0-1/FreeFileSync/Source/Makefile
+--- 11.0-0/FreeFileSync/Source/Makefile 2020-07-22 11:36:55.000000000 -0400
++++ 11.0-1/FreeFileSync/Source/Makefile 2020-07-22 13:36:27.193345688 -0400
@@ -1,10 +1,10 @@
-exeName = FreeFileSync_$(shell arch)
+exeName = FreeFileSync
@@ -27,18 +28,23 @@ diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Make
cxxFlags += `pkg-config --cflags openssl`
-@@ -17,6 +17,7 @@ cxxFlags += `pkg-config --cflags libssh2`
+@@ -16,9 +16,10 @@
+ cxxFlags += `pkg-config --cflags libssh2`
linkFlags += `pkg-config --libs libssh2`
-
- cxxFlags += `pkg-config --cflags gtk+-2.0`
-+linkFlags += `pkg-config --libs gtk+-2.0`
+
+-cxxFlags += `pkg-config --cflags gtk+-2.0`
++cxxFlags += `pkg-config --cflags gtk+-3.0`
++linkFlags += `pkg-config --libs gtk+-3.0`
#treat as system headers so that warnings are hidden:
- cxxFlags += -isystem/usr/include/gtk-2.0
-
-diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 2019-04-12 07:59:45.008146336 -0400
-+++ 10.15-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-08-15 13:59:53.934551753 -0400
-@@ -1,13 +1,14 @@
+-cxxFlags += -isystem/usr/include/gtk-2.0
++cxxFlags += -isystem/usr/include/gtk-3.0
+
+ #support for SELinux (optional)
+ SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
+diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Source/RealTimeSync/Makefile 11.0-1/FreeFileSync/Source/RealTimeSync/Makefile
+--- 11.0-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-07-22 11:36:55.000000000 -0400
++++ 11.0-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-07-22 13:36:32.262394424 -0400
+@@ -1,15 +1,16 @@
-exeName = RealTimeSync_$(shell arch)
+exeName = RealTimeSync
@@ -50,12 +56,16 @@ diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSyn
+linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
#Gtk - support "no button border"
- cxxFlags += `pkg-config --cflags gtk+-2.0`
-+linkFlags += `pkg-config --libs gtk+-2.0`
+-cxxFlags += `pkg-config --cflags gtk+-2.0`
++cxxFlags += `pkg-config --cflags gtk+-3.0`
++linkFlags += `pkg-config --libs gtk+-3.0`
#treat as system headers so that warnings are hidden:
- cxxFlags += -isystem/usr/include/gtk-2.0
+-cxxFlags += -isystem/usr/include/gtk-2.0
++cxxFlags += -isystem/usr/include/gtk-3.0
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
+ cppFiles=
+ cppFiles+=application.cpp
+iff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
--- 10.22-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:49:57.837901137 -0400
+++ 10.22-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:51:50.381251257 -0400
@@ -97,6 +97,8 @@
@@ -67,3 +77,15 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
build += SPACED_BULLET;
build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
+diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/wx+/dc.h 11.0-1/wx+/dc.h
+--- 11.0-0/wx+/dc.h 2020-07-22 11:36:55.000000000 -0400
++++ 11.0-1/wx+/dc.h 2020-07-22 13:37:49.535137357 -0400
+@@ -55,7 +55,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!
bgstack15