summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_devuan.patch
blob: 67846e1654b854a070bdac3e2e704fa66ae5196b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
Author: B Stack
Source: Original research
Last date modified: 2020-02-15
Message: Main patch to compile on Devuan.
diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/ffs_paths.cpp 10.18-1/FreeFileSync/Source/ffs_paths.cpp
--- 10.13-0/FreeFileSync/Source/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
+++ 10.18-1/FreeFileSync/Source/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 '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/Makefile 10.24-1/FreeFileSync/Source/Makefile
--- 10.24-0/FreeFileSync/Source/Makefile	2020-05-17 11:01:12.813889858 -0400
+++ 10.24-1/FreeFileSync/Source/Makefile	2020-05-17 11:29:01.456713486 -0400
@@ -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" \
+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 `wx-config --libs std, aui --debug=no` -lz -pthread
 
 
 cxxFlags  += `pkg-config --cflags openssl`
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.21-1/FreeFileSync/Source/ui/small_dlgs.cpp  2020-03-18 09:03:57.753183052 -0400
@@ -97,6 +97,8 @@
     build += L"64 Bit";
 #endif
 
+    build += L" for Devuan";
+
     build += SPACED_BULLET;
     build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
 
diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/RealTimeSync/Makefile 10.24-1/FreeFileSync/Source/RealTimeSync/Makefile
--- 10.24-0/FreeFileSync/Source/RealTimeSync/Makefile	2020-05-17 11:01:12.853890213 -0400
+++ 10.24-1/FreeFileSync/Source/RealTimeSync/Makefile	2020-05-17 11:29:17.540857423 -0400
@@ -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" \
+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 `wx-config --libs std, aui --debug=no` -lz -pthread
 
 #Gtk - support "no button border"
 cxxFlags  += `pkg-config --cflags gtk+-2.0`
bgstack15