freefilesync dpkg rc1 for gtk2

1 files changed, 70 insertions, 0 deletions

diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
new file mode 100644
index 0000000..4ad070c
--- /dev/null
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -0,0 +1,70 @@
+Author: B Stack
+Source: Original research
+Date: 2019-11-21
+Message: Main patch to compile on Devuan.
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/ffs_paths.cpp 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp
+--- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
++++ 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-11-21 09:41:42.287474472 -0500
+@@ -64,7 +64,8 @@
+ 
+ Zstring fff::getResourceDirPf()
+ {
+-    return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR;
++    // For Fedora, EL and Devuan, install to /usr/share/freefilesync specificly
++    return Zstr("/usr/share/freefilesync/");
+ }
+ 
+ 
+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-2/FreeFileSync/Source/Makefile	2019-11-21 09:42:57.408243242 -0500
+@@ -1,10 +1,10 @@
+-EXENAME = FreeFileSync_$(shell arch)
++EXENAME = FreeFileSync
+ 
+ CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
+            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ 
+-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
++LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+ 
+ 
+ CXXFLAGS  += `pkg-config --cflags openssl`
+@@ -84,6 +85,7 @@
+ CPP_FILES+=../../zen/file_io.cpp
+ CPP_FILES+=../../zen/file_traverser.cpp
+ CPP_FILES+=../../zen/http.cpp
++CPP_FILES+=../../zen/system.cpp
+ CPP_FILES+=../../zen/zstring.cpp
+ CPP_FILES+=../../zen/format_unit.cpp
+ CPP_FILES+=../../zen/legacy_compiler.cpp
+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
+--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
++++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 08:56:49.251467477 -0500
+@@ -95,6 +95,8 @@
+     build += L"64 Bit";
+ #endif
+ 
++    build += L" for Devuan";
++
+     build += SPACED_BULLET;
+     build += formatTime<wxString>(FORMAT_DATE, getCompileTime());
+ 
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile
+--- 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 11:45:58.241515736 -0500
++++ 10.20-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 15:41:50.787195378 -0500
+@@ -1,10 +1,10 @@
+-EXENAME = RealTimeSync_$(shell arch)
++EXENAME = RealTimeSync
+ 
+ CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
+            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ 
+-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
++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`
+