From c6aac65b3a7673034390bc7f7349ed32cade47ab Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Wed, 14 Sep 2022 16:01:07 -0400
Subject: fix build/fuzz issues

---
 freefilesync/_service                             | 28 -----------------------
 freefilesync/debian/freefilesync+devuan.dsc       |  2 +-
 freefilesync/debian/patches/ffs_devuan_gtk3.patch | 20 ++++++++--------
 3 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 freefilesync/_service

(limited to 'freefilesync')

diff --git a/freefilesync/_service b/freefilesync/_service
deleted file mode 100644
index cfb2e24..0000000
--- a/freefilesync/_service
+++ /dev/null
@@ -1,28 +0,0 @@
-<services>
-   <service name="tar_scm">
-      <param name="scm">git</param>
-      <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param>
-      <param name="subdir">freefilesync/debian</param>
-      <param name="filename">debian</param>
-      <param name="revision">freefilesync-bump</param>
-      <param name="version">_none_</param>
-   </service>
-   <service name="recompress">
-      <param name="file">*.tar</param>
-      <param name="compression">xz</param>
-   </service>
-   <service name="tar_scm">
-      <param name="scm">git</param>
-      <param name="url">https://gitlab.com/opensource-tracking/FreeFileSync.git</param>
-      <param name="revision">11.23</param>
-      <param name="version">_none_</param>
-   </service>
-   <service name="recompress">
-      <param name="file">*.tar</param>
-      <param name="compression">gz</param>
-   </service>
-   <service name="extract_file">
-      <param name="archive">*.tar.xz</param>
-      <param name="files">*/*.dsc</param>
-   </service>
-</services>
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc
index 27e0c6f..aa2ca30 100644
--- a/freefilesync/debian/freefilesync+devuan.dsc
+++ b/freefilesync/debian/freefilesync+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: freefilesync
 Binary: freefilesync
 Architecture: any
-Version: 11.23-1+devuan
+Version: 11.25-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 6df123b..9020da4 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -3,12 +3,11 @@ Source: Original research
 Version: 11.25
 Date: 2020-09-07
 Message: Main patch to compile on Devuan using GTK3.
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile
---- 11.25-0/FreeFileSync/Source/Makefile 2019-04-12 08:05:57.000000000 -0400
-+++ 11.25-1/FreeFileSync/Source/Makefile 2019-11-21 09:42:57.408243242 -0500
-@@ -16,9 +16,10 @@
- cxxFlags  += `pkg-config --cflags libssh2`
- linkFlags += `pkg-config --libs   libssh2`
+--- a/FreeFileSync/Source/Makefile
++++ b/FreeFileSync/Source/Makefile
+@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs   libcurl`
+ CXXFLAGS  += `pkg-config --cflags libssh2`
+ LDFLAGS += `pkg-config --libs   libssh2`
  
 -CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
 +CXXFLAGS  += `pkg-config --cflags gtk+-3.0`
@@ -19,11 +18,10 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  
  #support for SELinux (optional)
  SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
-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 18:30:59.289498093 -0400
-+++ 10.24-1/FreeFileSync/Source/RealTimeSync/Makefile	2020-05-17 19:32:59.791394275 -0400
-@@ -7,9 +7,10 @@
- linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread
+--- a/FreeFileSync/Source/RealTimeSync/Makefile
++++ b/FreeFileSync/Source/RealTimeSync/Makefile
+@@ -8,9 +8,10 @@ CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO
+ 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`
-- 
cgit