From 4e3efef52a6ded8a1c5634b18c015d1a20ae1297 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Wed, 14 Sep 2022 21:17:57 -0400
Subject: defuzz desktop notifications patch

---
 .../debian/patches/ffs_desktop_notifications.patch   | 20 +++++++++-----------
 freefilesync/ffs_desktop_notifications.patch         | 18 ++++++++----------
 2 files changed, 17 insertions(+), 21 deletions(-)

(limited to 'freefilesync')

diff --git a/freefilesync/debian/patches/ffs_desktop_notifications.patch b/freefilesync/debian/patches/ffs_desktop_notifications.patch
index 6e61bc7..5989a9c 100644
--- a/freefilesync/debian/patches/ffs_desktop_notifications.patch
+++ b/freefilesync/debian/patches/ffs_desktop_notifications.patch
@@ -1,13 +1,12 @@
-Version: 11.17
-Date: 2022-02-06
+Version: 11.25
+Date: 2022-09-14
 Author: bgstack15
 Message: Add support for building with desktop notification support.
-diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefile
---- 11.9-1/FreeFileSync/Source/Makefile	2021-05-06 16:24:53.987902373 -0400
-+++ 11.9-2/FreeFileSync/Source/Makefile	2021-05-06 17:09:31.512474440 -0400
-@@ -22,6 +22,13 @@
+--- a/FreeFileSync/Source/Makefile
++++ b/FreeFileSync/Source/Makefile
+@@ -23,6 +23,13 @@ LDFLAGS   += `pkg-config --libs   gtk+-3
  #treat as system headers so that warnings are hidden:
- CXXFLAGS  += -isystem/usr/include/gtk-2.0
+ CXXFLAGS  += -isystem/usr/include/gtk-3.0
  
 +with_notifications ?= NO
 +ifeq ($(with_notifications),YES)
@@ -19,9 +18,8 @@ diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefil
  #support for SELinux (optional)
  SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
  ifeq ($(SELINUX_EXISTING),YES)
-diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp
---- 11.17-0/FreeFileSync/Source/ui/progress_indicator.cpp	2022-02-06 16:30:56.883997654 -0500
-+++ 11.17-1/FreeFileSync/Source/ui/progress_indicator.cpp	2022-02-06 17:05:57.763911330 -0500
+--- a/FreeFileSync/Source/ui/progress_indicator.cpp
++++ b/FreeFileSync/Source/ui/progress_indicator.cpp
 @@ -31,6 +31,9 @@
  #include "../icon_buffer.h"
  #include "../base/speed_test.h"
@@ -32,7 +30,7 @@ diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSy
  
  using namespace zen;
  using namespace fff;
-@@ -1372,6 +1375,22 @@
+@@ -1377,6 +1380,22 @@ void SyncProgressDialogImpl<TopLevelDial
      pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult));
      //pnl_.m_bitmapStatus->SetToolTip(); -> redundant
  
diff --git a/freefilesync/ffs_desktop_notifications.patch b/freefilesync/ffs_desktop_notifications.patch
index 1556167..5989a9c 100644
--- a/freefilesync/ffs_desktop_notifications.patch
+++ b/freefilesync/ffs_desktop_notifications.patch
@@ -1,11 +1,10 @@
-Version: 11.17
-Date: 2022-02-06
+Version: 11.25
+Date: 2022-09-14
 Author: bgstack15
 Message: Add support for building with desktop notification support.
-diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefile
---- 11.9-1/FreeFileSync/Source/Makefile	2021-05-06 16:24:53.987902373 -0400
-+++ 11.9-2/FreeFileSync/Source/Makefile	2021-05-06 17:09:31.512474440 -0400
-@@ -22,6 +22,13 @@
+--- a/FreeFileSync/Source/Makefile
++++ b/FreeFileSync/Source/Makefile
+@@ -23,6 +23,13 @@ LDFLAGS   += `pkg-config --libs   gtk+-3
  #treat as system headers so that warnings are hidden:
  CXXFLAGS  += -isystem/usr/include/gtk-3.0
  
@@ -19,9 +18,8 @@ diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefil
  #support for SELinux (optional)
  SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
  ifeq ($(SELINUX_EXISTING),YES)
-diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp
---- 11.17-0/FreeFileSync/Source/ui/progress_indicator.cpp	2022-02-06 16:30:56.883997654 -0500
-+++ 11.17-1/FreeFileSync/Source/ui/progress_indicator.cpp	2022-02-06 17:05:57.763911330 -0500
+--- a/FreeFileSync/Source/ui/progress_indicator.cpp
++++ b/FreeFileSync/Source/ui/progress_indicator.cpp
 @@ -31,6 +31,9 @@
  #include "../icon_buffer.h"
  #include "../base/speed_test.h"
@@ -32,7 +30,7 @@ diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSy
  
  using namespace zen;
  using namespace fff;
-@@ -1372,6 +1375,22 @@
+@@ -1377,6 +1380,22 @@ void SyncProgressDialogImpl<TopLevelDial
      pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult));
      //pnl_.m_bitmapStatus->SetToolTip(); -> redundant
  
-- 
cgit