ffs 10.19 dpkg rc1, gtk2

3 files changed, 23 insertions, 24 deletions

diff --git a/freefilesync/debian/patches/ffs_devuan_gtk2.patch b/freefilesync/debian/patches/ffs_devuan_gtk2.patch
index f7680d7..9db9584 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk2.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk2.patch
@@ -68,15 +68,15 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  
  CPP_FILES=
  CPP_FILES+=application.cpp
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.18-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-04-12 08:05:57.000000000 -0400
-+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-04-12 13:58:55.050550183 -0400
-@@ -117,6 +117,8 @@
-         L" x64";
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
++++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 08:56:49.251467477 -0500
+@@ -95,6 +95,8 @@
+     build += L"64 Bit";
  #endif
  
-+    build +=
-+        L" for Devuan";
- 
-     GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
++    build += L" for Devuan";
++
+     build += SPACED_BULLET;
+     build += formatTime<wxString>(FORMAT_DATE, getCompileTime());
  
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 705d84d..787f6d5 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -69,17 +69,17 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  
  CPP_FILES=
  CPP_FILES+=application.cpp
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.18-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-04-12 08:05:57.000000000 -0400
-+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-04-12 13:58:55.050550183 -0400
-@@ -117,6 +117,8 @@
-         L" x64";
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
++++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 08:56:49.251467477 -0500
+@@ -95,6 +95,8 @@
+     build += L"64 Bit";
  #endif
  
-+    build +=
-+        L" for Devuan";
- 
-     GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
++    build += L" for Devuan";
++
+     build += SPACED_BULLET;
+     build += formatTime<wxString>(FORMAT_DATE, getCompileTime());
  
 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1/wx+/dc.h
 --- 10.18-0/wx+/dc.h	2019-11-21 08:24:23.967769384 -0500
diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch
index 92b5372..204740d 100644
--- a/freefilesync/debian/patches/ffs_no_wx311.patch
+++ b/freefilesync/debian/patches/ffs_no_wx311.patch
@@ -1,13 +1,12 @@
 2019-08-15 just compile. 
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-07 05:03:34.000000000 -0400
-+++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-08 19:16:54.026727623 -0400
-@@ -984,7 +984,8 @@
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
++++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 08:41:43.498308243 -0500
+@@ -1546,7 +1546,7 @@
      //setMainInstructionFont(*m_staticTextMain);
  
-     m_bitmapActivation->SetBitmap(getResourceImage(L"website"));
+     m_bitmapActivation->SetBitmap(getResourceImage(L"internet"));
 -    m_textCtrlOfflineActivationKey->ForceUpper();
-+    // Fedora 27 does not have wxWidgets 3.1.1 yet. https://github.com/wxWidgets/wxWidgets/commit/69b66e9e2e2b8e49e3816acdde079686ce9b0da1
 +    //m_textCtrlOfflineActivationKey->ForceUpper();
  
      m_textCtrlLastError           ->ChangeValue(lastErrorMsg);