fix ffs_devuan.patch minor problems

    dpkg-source: error: diff 'BUILD/debian/patches/ffs_devuan.patch' patches files multiple times; split the diff in multiple files or merge the hunks into a single one

1 files changed, 20 insertions, 22 deletions

diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index 3607567..bc9ad4a 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -1,7 +1,7 @@
 Author: bgstack15
 Source: Original research
-Last-Modified: 2022-05-22
-Last-Version: 11.21
+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
@@ -32,6 +32,7 @@ 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
@@ -44,26 +45,6 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou
      build += SPACED_BULLET;
      build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
  
-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
-@@ -1,10 +1,10 @@
--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" \
-+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
- 
--linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
-+linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread
- 
- #Gtk - support "no button border"
- cxxFlags  += `pkg-config --cflags gtk+-2.0`
-Message: some random sloppiness with a missing graphical asset. It's not important to the application.
---- 11.22-0/FreeFileSync/Source/ui/small_dlgs.cpp	2022-06-26 16:03:49.887270966 -0400
-+++ 11.22-1/FreeFileSync/Source/ui/small_dlgs.cpp	2022-06-26 16:03:52.123298767 -0400
 @@ -140,9 +140,9 @@
  
      wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files
@@ -86,3 +67,20 @@ Message: some random sloppiness with a missing graphical asset. It's not importa
  
          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
+@@ -1,10 +1,10 @@
+-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" \
++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
+ 
+-linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
++linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread
+ 
+ #Gtk - support "no button border"
+ cxxFlags  += `pkg-config --cflags gtk+-2.0`