Merge branch 'freefilesync-bump' into 'master'

ffs 11.9

See merge request bgstack15/stackrpms!232

7 files changed, 41 insertions, 34 deletions

diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 8ad2afc..bb65c17 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,29 @@
+freefilesync (11.9-1+devuan) obs; urgency=medium
+
+  * Upstream updates
+    - Save different layouts depending on screen resolution
+    - Fixed large file icon scaling quality (Windows)
+    - Fixed broken default filter excluding DocumentRevisions (macOS)
+    - Don't immediately exit terminal when installer error is showing
+      (Linux)
+    - Explicitly set file permissions when installing missing
+      directories (Linux)
+    - Support installation using noexec temp directory (Linux)
+    - Don't fail installation if root is the only user (Linux)
+    - Added automatic socket close on execv (Linux, macOS)
+    - Fixed Google Drive login hanging after authentication (Linux)
+    - Correctly generate and parse Windows epoch time (Windows, macOS)
+
+ -- B. Stack <bgstack15@gmail.com>  Mon, 05 Apr 2021 11:04:34 -0400
+
+freefilesync (11.8-1+devuan) UNRELEASED; urgency=medium
+
+  * Upstream updates
+    - Fixed unexpected file size error when copying to (S)FTP, and
+      Google Drive
+
+ -- B. Stack <bgstack15@gmail.com>  Wed, 03 Mar 2021 00:00:00 -0500
+
 freefilesync (11.7-1+devuan) obs; urgency=medium
 
   * Upstream updates
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc
index e2ad9ba..9fb345a 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.7-1+devuan
+Version: 11.9-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
index 3d00225..90bd831 100644
--- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -1,16 +1,5 @@
+Last version tested: 11.9
 This is still experimental.
-diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/config.cpp 11.4-1/FreeFileSync/Source/config.cpp
---- 11.4-0/FreeFileSync/Source/config.cpp	2020-12-08 08:15:29.428156465 -0500
-+++ 11.4-1/FreeFileSync/Source/config.cpp	2020-12-08 19:12:03.373121599 -0500
-@@ -1200,7 +1200,7 @@
-     }
-     else
-     {
--        size_t parallelOps = 1;
-+        size_t parallelOps = 5;
-         if (const XmlElement* e = in["VersioningFolder"].get()) e->getAttribute("Threads", parallelOps); //try to get attribute
- 
-         const size_t parallelOpsPrev = getDeviceParallelOps(deviceParallelOps, syncCfg.versioningFolderPhrase);
 diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp
 --- 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 08:15:29.428156465 -0500
 +++ 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 19:12:09.205183330 -0500
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
index 30146b7..6cae409 100644
--- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
@@ -156,11 +156,11 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu
      {
          SetLabel(label);
 diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/wx+/dc.h
---- 11.6-0/wx+/dc.h	2021-02-02 11:37:38.777718874 -0500
-+++ 11.6-1/wx+/dc.h	2021-02-02 13:05:02.297177154 -0500
-@@ -68,9 +68,6 @@
+--- 11.9-0/wx+/dc.h	2021-04-05 10:57:36.518697734 -0400
++++ 11.9-1/wx+/dc.h	2021-04-05 11:11:21.809650868 -0400
+@@ -69,9 +69,6 @@
  inline
- int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered)
+ int getDPI()
  {
 -#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS
 -#error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined?
diff --git a/freefilesync/ffs_allow_parallel_ops.patch b/freefilesync/ffs_allow_parallel_ops.patch
index 3d00225..90bd831 100644
--- a/freefilesync/ffs_allow_parallel_ops.patch
+++ b/freefilesync/ffs_allow_parallel_ops.patch
@@ -1,16 +1,5 @@
+Last version tested: 11.9
 This is still experimental.
-diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/config.cpp 11.4-1/FreeFileSync/Source/config.cpp
---- 11.4-0/FreeFileSync/Source/config.cpp	2020-12-08 08:15:29.428156465 -0500
-+++ 11.4-1/FreeFileSync/Source/config.cpp	2020-12-08 19:12:03.373121599 -0500
-@@ -1200,7 +1200,7 @@
-     }
-     else
-     {
--        size_t parallelOps = 1;
-+        size_t parallelOps = 5;
-         if (const XmlElement* e = in["VersioningFolder"].get()) e->getAttribute("Threads", parallelOps); //try to get attribute
- 
-         const size_t parallelOpsPrev = getDeviceParallelOps(deviceParallelOps, syncCfg.versioningFolderPhrase);
 diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp
 --- 11.4-0/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 08:15:29.428156465 -0500
 +++ 11.4-1/FreeFileSync/Source/ui/folder_selector.cpp	2020-12-08 19:12:09.205183330 -0500
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 3266986..7b8dbec 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -19,7 +19,7 @@
 %define libssh2_name libssh2-%{name}
 %endif
 Name:       freefilesync
-Version:    11.7
+Version:    11.9
 Release:    1%{?dist}
 Summary:    A file synchronization utility
 
@@ -207,6 +207,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
 
 %changelog
+* Mon Apr 05 2021 B. Stack <bgstack15@gmail.com> - 11.9-1
+- version bump
+
 * Tue Mar 02 2021 B. Stack <bgstack15@gmail.com> - 11.7-1
 - version bump
 
diff --git a/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch
index 30146b7..6cae409 100644
--- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/revert_zenju_aggressive_upstreamisms.patch
@@ -156,11 +156,11 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu
      {
          SetLabel(label);
 diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/wx+/dc.h
---- 11.6-0/wx+/dc.h	2021-02-02 11:37:38.777718874 -0500
-+++ 11.6-1/wx+/dc.h	2021-02-02 13:05:02.297177154 -0500
-@@ -68,9 +68,6 @@
+--- 11.9-0/wx+/dc.h	2021-04-05 10:57:36.518697734 -0400
++++ 11.9-1/wx+/dc.h	2021-04-05 11:11:21.809650868 -0400
+@@ -69,9 +69,6 @@
  inline
- int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered)
+ int getDPI()
  {
 -#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS
 -#error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined?