Author: bgstack15
Source: Original research
Last-Modified: 2022-09-07
Last-Version: 11.25
Message: Main patch to compile on Devuan.
--- a/FreeFileSync/Source/ffs_paths.cpp
+++ b/FreeFileSync/Source/ffs_paths.cpp
@@ -49,7 +49,7 @@ Zstring fff::getInstallDirPath()
 
 Zstring fff::getResourceDirPath()
 {
-    return appendPath(getProcessParentFolderPath(), Zstr("Resources"));
+    return Zstr("/usr/share/freefilesync/");
 }
 
 
--- 11.25-0/FreeFileSync/Source/Makefile	2022-09-07 14:54:31.444628869 -0400
+++ 11.25-1/FreeFileSync/Source/Makefile	2022-09-07 15:15:48.735015001 -0400
@@ -1,11 +1,11 @@
 CXX ?= g++
-exeName = FreeFileSync_$(shell arch)
+exeName = FreeFileSync
 
 CXXFLAGS += -std=c++2b -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
 
-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
+LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz
 
 
 CXXFLAGS  += `pkg-config --cflags openssl`
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -89,6 +89,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
     build += LTR_MARK; //fix Arabic
     build += utfTo<wxString>(cpuArchName);
 
+    build += L" for Devuan";
+
     build += SPACED_BULLET;
     build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
 
@@ -139,9 +141,9 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
 
     wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files
 
-    wxImage animalImg(utfTo<wxString>(appendPath(getResourceDirPath(), Zstr("Animal.dat"))), wxBITMAP_TYPE_JPEG);
-    convertToVanillaImage(animalImg);
-    assert(animalImg.IsOk());
+    //wxImage animalImg(utfTo<wxString>(appendPath(getResourceDirPath(), Zstr("Animal.dat"))), wxBITMAP_TYPE_JPEG);
+    //convertToVanillaImage(animalImg);
+    //assert(animalImg.IsOk());
 
     //--------------------------------------------------------------------------
     //have animal + text match *final* dialog width
@@ -151,7 +153,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
         const int imageWidth = (m_panelDonate->GetSize().GetWidth() - 5 - 5 /* grey border*/) / 2;
         const int textWidth  =  m_panelDonate->GetSize().GetWidth() - 5 - 5 - imageWidth;
 
-        setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, imageWidth, -1 /*maxHeight*/));
+        //setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, imageWidth, -1 /*maxHeight*/));
 
         m_staticTextDonate->Show();
         m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size
--- 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile	2022-09-07 14:54:31.524629769 -0400
+++ 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile	2022-09-07 15:16:18.479350210 -0400
@@ -1,11 +1,11 @@
 CXX ?= g++
-exeName = RealTimeSync_$(shell arch)
+exeName = RealTimeSync
 
 CXXFLAGS += -std=c++2b -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
 
-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
+LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz
 
 #Gtk - support "no button border"
 CXXFLAGS  += `pkg-config --cflags gtk+-2.0`