From d339c145870a86c37509debe5d8fa145e192f390 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Fri, 9 Feb 2024 21:09:54 -0500
Subject: ffs: major refresh on top of bastif dpkg

---
 freefilesync/debian/patches/ffs_devuan.patch | 49 +++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 8 deletions(-)

(limited to 'freefilesync/debian/patches/ffs_devuan.patch')

diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index a835ccb..0be089d 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -1,8 +1,8 @@
 Author: bgstack15
 Source: Original research
-Last-Modified: 2023-07-24
-Last-Version: 12.5
-Message: Main patch to compile on Devuan.
+Last-Modified: 2024-02-09
+Last-Version: 13.3
+Message: Main patch to compile on Devuan. Updated with some improvements from bastif (Fab Stz)
 --- a/FreeFileSync/Source/ffs_paths.cpp
 +++ b/FreeFileSync/Source/ffs_paths.cpp
 @@ -54,7 +54,7 @@ Zstring fff::getInstallDirPath()
@@ -23,20 +23,43 @@ Message: Main patch to compile on Devuan.
  
  CXXFLAGS += -std=c++23 -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
+-           -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
++           -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
++LDFLAGS += `wx-config --libs std, aui, richtext --debug=no` -pthread
  
  
  CXXFLAGS  += `pkg-config --cflags openssl`
+@@ -28,6 +28,12 @@ CXXFLAGS  += `pkg-config --cflags libsel
+ LDFLAGS += `pkg-config --libs libselinux`
+ endif
+ 
++ifeq ($(DPKG_VENDOR),)
++#DPKG_VENDOR = $(shell dpkg-vendor --query vendor)
++DPKG_VENDOR = "Devuan"
++CPPFLAGS += -DAPP_NAME_SUFFIX='L" for ${DPKG_VENDOR}"'
++endif
++
+ cppFiles=
+ cppFiles+=application.cpp
+ cppFiles+=base_tools.cpp
+@@ -124,7 +130,7 @@ all: ../Build/Bin/$(exeName)
+ 
+ $(tmpPath)/ffs/src/%.o : %
+ 	mkdir -p $(dir $@)
+-	$(CXX) $(CXXFLAGS) -c $< -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ clean:
+ 	rm -rf $(tmpPath)
 --- a/FreeFileSync/Source/ui/small_dlgs.cpp
 +++ b/FreeFileSync/Source/ui/small_dlgs.cpp
 @@ -90,6 +90,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
      build += LTR_MARK; //fix Arabic
      build += utfTo<wxString>(cpuArchName);
  
-+    build += L" for Devuan";
++    build += APP_NAME_SUFFIX;
 +
      build += SPACED_BULLET;
      build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
@@ -71,10 +94,20 @@ Message: Main patch to compile on Devuan.
  
  CXXFLAGS += -std=c++23 -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
+-           -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
++           -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
++LDFLAGS += `wx-config --libs std, aui, richtext --debug=no` -pthread
  
  #Gtk - support "no button border"
  CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
+@@ -60,7 +60,7 @@ all: ../../Build/Bin/$(exeName)
+ 
+ $(tmpPath)/ffs/src/rts/%.o : %
+ 	mkdir -p $(dir $@)
+-	$(CXX) $(CXXFLAGS) -c $< -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ clean:
+ 	rm -rf $(tmpPath)
-- 
cgit