From 347c17993925ea390e766e4ae173df520c9ac907 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Wed, 3 Aug 2022 11:20:39 -0400
Subject: ffs: fix fuzz/patches

---
 freefilesync/debian/patches/ffs_devuan.patch | 29 ++++++++++++----------------
 1 file changed, 12 insertions(+), 17 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 bc9ad4a..de2bd20 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -3,10 +3,9 @@ Source: Original research
 Last-Modified: 2022-08-03
 Last-Version: 11.23
 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
-+++ 11.21-1/FreeFileSync/Source/ffs_paths.cpp	2019-11-21 09:41:42.287474472 -0500
-@@ -49,7 +49,7 @@
+--- a/FreeFileSync/Source/ffs_paths.cpp
++++ b/FreeFileSync/Source/ffs_paths.cpp
+@@ -49,7 +49,7 @@ Zstring fff::getInstallDirPath()
  
  Zstring fff::getResourceDirPath()
  {
@@ -15,9 +14,8 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  }
  
  
-diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/Makefile 11.4-1/FreeFileSync/Source/Makefile
---- 11.20-0/FreeFileSync/Source/Makefile	2022-04-18 09:49:31.901386387 -0400
-+++ 11.20-1/FreeFileSync/Source/Makefile	2022-04-18 10:00:41.504569833 -0400
+--- a/FreeFileSync/Source/Makefile
++++ b/FreeFileSync/Source/Makefile
 @@ -1,10 +1,10 @@
 -exeName = FreeFileSync_$(shell arch)
 +exeName = FreeFileSync
@@ -32,11 +30,9 @@ diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/Makefile 11
  
  
  cxxFlags  += `pkg-config --cflags openssl`
-Message: some random sloppiness with a missing graphical asset. It's not important to the application.
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
-+++ 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp  2021-07-15 09:03:57.753183052 -0400
-@@ -93,6 +93,8 @@
+--- 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);
  
@@ -45,7 +41,7 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
      build += SPACED_BULLET;
      build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
  
-@@ -140,9 +140,9 @@
+@@ -139,9 +141,9 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
  
      wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files
  
@@ -58,7 +54,7 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
  
      //--------------------------------------------------------------------------
      //have animal + text match *final* dialog width
-@@ -152,7 +152,7 @@
+@@ -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;
  
@@ -67,9 +63,8 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
  
          m_staticTextDonate->Show();
          m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size
-diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 11.20-0/FreeFileSync/Source/RealTimeSync/Makefile	2022-04-18 09:49:31.901386387 -0400
-+++ 11.20-1/FreeFileSync/Source/RealTimeSync/Makefile	2022-04-18 10:00:35.168501749 -0400
+--- a/FreeFileSync/Source/RealTimeSync/Makefile
++++ b/FreeFileSync/Source/RealTimeSync/Makefile
 @@ -1,10 +1,10 @@
 -exeName = RealTimeSync_$(shell arch)
 +exeName = RealTimeSync
-- 
cgit