ffs 11.0 dpkg rc1

   Upstream now says it works with gtk3! So we have dropped
   gtk2 patches for devuan.

8 files changed, 50 insertions, 69 deletions

diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 2bd53b5..4b1a593 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,28 @@
+freefilesync (11.0-1+devuan) obs; urgency=medium
+
+  * Revised file layout on main grid
+  * Skip download/upload when copying Google Drive files inside account
+  * Support moving Google Drive files between shared drives and My Drive
+  * Support copying Google Drive shortcuts between accounts
+  * Support copying Google Docs, Sheets, Slides, etc. within account
+  * Fixed parsing uninitialized Google Drive modification time
+  * Fixed Google Drive file already existing check running too late
+  * Ignore slash/backslash differences during manual search
+  * Avoid creating orphan database entry if one DB file fails to load
+  * Limit modification time error count for log file warning message
+  * Support copying WSL symlinks
+  * Avoid duplicate MTP/Google Drive item creation from multiple threads
+  * Fixed TMPDIR not found during startup (macOS)
+  * Added sync variant icons
+  * Avoid redundant icon format conversions
+  * Buffer high-DPI image scaling results
+  * Improved MTP thumbnail scaling performance
+  * Avoid race condition during parallel file icon rendering (Linux)
+  * Allow creating folder name with leading/trailing spaces
+  * Start supporting GTK3 (Linux)
+
+ -- Ben Stack <bgstack15@gmail.com>  Wed, 22 Jul 2020 12:55:46 -0400
+
 freefilesync (10.25-2+devuan) obs; urgency=medium
 
   * gtk2 build (stable)
diff --git a/freefilesync/debian/control b/freefilesync/debian/control
index 92c55ca..17ed18d 100644
--- a/freefilesync/debian/control
+++ b/freefilesync/debian/control
@@ -5,20 +5,17 @@ Maintainer: B Stack <bgstack15@gmail.com>
 Build-Depends: debhelper (>=12~),
                imagemagick,
                g++-10,
+               libbrotli-dev,
                libcurl4-openssl-dev (>=7.68.0),
                libssh2-1-dev,
                libssl-dev,
                wx3.0-headers,
                unzip,
-# gtk2 version, now possible only with local devuan-archive, and these must be removed for gtk3 build
-# install with sudo apt-get install libwxbase3.0-0v5=3.0.4+dfsg-14 libwxbase3.0-dev=3.0.4+dfsg-14 libwxgtk3.0-0v5=3.0.4+dfsg-14 libwxgtk3.0-dev=3.0.4+dfsg-14 wx3.0-headers=3.0.4+dfsg-14 libgtk2.0-dev
-               libgtk2.0-dev,
-               libwxgtk3.0-dev (=3.0.4+dfsg-14),
 # gtk3 version, and these must be removed for gtk2 build
 # install with sudo apt-get install libwxbase3.0-dev=3.0.4+dfsg-15 libwxbase3.0-0v5=3.0.4+dfsg-15 wx3.0-headers=3.0.4+dfsg-15 libgtk-3-dev libwxgtk3.0-gtk3-dev
 # which will remove libwxbase3.0-dev=3.0.4+dfsg-14
-#               libgtk-3-dev,
-#               libwxgtk3.0-gtk3-dev,
+               libgtk-3-dev,
+               libwxgtk3.0-gtk3-dev,
 Standards-Version: 4.1.4
 Homepage: https://freefilesync.org/
 
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk2.patch b/freefilesync/debian/patches/ffs_devuan_gtk2.patch
deleted file mode 100644
index 49a7c24..0000000
--- a/freefilesync/debian/patches/ffs_devuan_gtk2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: B Stack
-Source: Original research
-Date: 2019-11-21
-Message: Patches to use gtk2. Depends on ffs_devuan.patch
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile
---- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 08:05:57.000000000 -0400
-+++ 10.18-2/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`
- 
--cxxFlags  += `pkg-config --cflags gtk+-2.0`
-+cxxFlags  += `pkg-config --cflags gtk+-2.0`
-+linkFlags += `pkg-config --libs   gtk+-2.0`
- #treat as system headers so that warnings are hidden:
--cxxFlags  += -isystem/usr/include/gtk-2.0
-+cxxFlags  += -isystem/usr/include/gtk-2.0
- 
- #support for SELinux (optional)
- SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.20-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 11:45:58.241515736 -0500
-+++ 10.20-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 15:43:32.852203730 -0500
-@@ -8,6 +8,7 @@
- 
- #Gtk - support "no button border"
- cxxFlags  += `pkg-config --cflags gtk+-2.0`
-+linkFlags += `pkg-config --libs   gtk+-2.0`
- #treat as system headers so that warnings are hidden:
- cxxFlags  += -isystem/usr/include/gtk-2.0
- 
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 3559261..16268d1 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -47,15 +47,3 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1
      //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114
      //=> requires general fix at wxWidgets-level
      assert(wxTheApp); //only call after wxWidgets was initalized!
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/icon_loader.cpp 10.18-1/FreeFileSync/Source/base/icon_loader.cpp
---- 10.18-0/FreeFileSync/Source/base/icon_loader.cpp	2019-11-21 08:24:23.955769262 -0500
-+++ 10.18-1/FreeFileSync/Source/base/icon_loader.cpp	2019-11-21 09:42:15.439813730 -0500
-@@ -18,7 +18,7 @@
- 
- namespace
- {
--static_assert(GTK_MAJOR_VERSION == 2, "FreeFileSync does NOT (currently) support GTK3! The GTK calls below will lead to crashes due to not being thread-safe on GTK3.");
-+static_assert(GTK_MAJOR_VERSION == 3, "FreeFileSync does NOT (currently) support GTK3! The GTK calls below will lead to crashes due to not being thread-safe on GTK3.");
- //gdk_threads_enter(); + ZEN_ON_SCOPE_EXIT(::gdk_threads_leave); is NOT enough; e.g. GTK3 + openSuse still crashes with:
- //  Gtk:ERROR:gtkicontheme.c:4026:proxy_pixbuf_destroy: assertion failed: (icon_info->proxy_pixbuf != NULL)
- //GTK icon theme internals: https://github.com/GNOME/gtk/blob/master/gtk/gtkicontheme.c
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 1ef4148..62f4e7e 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,7 +1,7 @@
 diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp
 --- 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp	2019-02-10 22:01:42.029158919 -0500
-+++ 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp	2019-07-16 10:56:40.213575535 -0400
-@@ -5298,7 +5298,7 @@
++++ 11.0-1/FreeFileSync/Source/ui/main_dlg.cpp	2020-07-22 11:49:13.747407290 -0400
+@@ -5538,7 +5538,7 @@
          globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
  
      m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
@@ -10,15 +10,15 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5306,6 +5306,7 @@
+@@ -5546,6 +5546,7 @@
          automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
-                                  automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get());
+                                  automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get());
      }
 +    */
  }
  
  
-@@ -5313,7 +5314,7 @@
+@@ -5553,7 +5554,7 @@
  {
      //execute just once per startup!
      Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
@@ -27,7 +27,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-
      if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
      {
          flashStatusInformation(_("Searching for program updates..."));
-@@ -5327,6 +5328,7 @@
+@@ -5567,6 +5568,7 @@
                                       resultAsync.get()); //run on main thread:
          });
      }
@@ -37,7 +37,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-
  
 diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 10.14-1/FreeFileSync/Source/ui/version_check.cpp
 --- 10.9-0/FreeFileSync/Source/ui/version_check.cpp	2019-02-10 22:01:42.126160041 -0500
-+++ 10.18-1/FreeFileSync/Source/ui/version_check.cpp	2019-11-20 09:19:50.936975067 -0500
++++ 11.0-1/FreeFileSync/Source/ui/version_check.cpp	2020-07-22 11:43:36.895201090 -0400
 @@ -69,6 +69,8 @@
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
@@ -47,7 +47,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -156,8 +158,7 @@
+@@ -159,8 +161,7 @@
      {
          try
          {
@@ -57,7 +57,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
              updateDetailsMsg = utfTo<std::wstring>(buf);
          }
          catch (const zen::SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); }
-@@ -182,8 +183,7 @@
+@@ -189,8 +190,7 @@
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
@@ -67,21 +67,22 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1
      return trimCpy(response);
  }
  
-@@ -235,13 +235,13 @@
-         const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError
+@@ -237,13 +237,13 @@
+         const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError
          lastOnlineVersion = onlineVersion;
  
 -        if (haveNewerVersionOnline(onlineVersion))
--            showUpdateAvailableDialog(parent, onlineVersion);
+-            showUpdateAvailableDialog(&parent, onlineVersion);
 -        else
 +        //if (haveNewerVersionOnline(onlineVersion))
-+        //    showUpdateAvailableDialog(parent, onlineVersion);
++        //    showUpdateAvailableDialog(&parent, onlineVersion);
 +        //else
-             showNotificationDialog(parent, DialogInfoType::info, PopupDialogCfg().
-                                    setIcon(getResourceImage("update_check")).
+             showNotificationDialog(&parent, DialogInfoType::info, PopupDialogCfg().
+                                    setIcon(loadImage("update_check")).
                                     setTitle(_("Check for Program Updates")).
 -                                   setMainInstructions(_("FreeFileSync is up to date.")));
 +                                   setMainInstructions(_("Use your package manager for any updates to FreeFileSync.")));
      }
      catch (const zen::SysError& e)
      {
+
diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch
index 926f7b8..22d8260 100644
--- a/freefilesync/debian/patches/ffs_no_wx311.patch
+++ b/freefilesync/debian/patches/ffs_no_wx311.patch
@@ -1,7 +1,7 @@
 2019-08-15 just compile. 
 diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp
 --- 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp	2020-06-19 16:17:15.000000000 -0400
-+++ 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp	2020-06-20 14:23:47.488836409 -0400
++++ 11.0-1/FreeFileSync/Source/ui/small_dlgs.cpp	2020-07-22 11:39:25.820068366 -0400
 @@ -293,7 +293,8 @@
      {
          showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
@@ -12,10 +12,10 @@ diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/So
  
      //set default values for Google Drive: use first item of m_listBoxGdriveUsers
      if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase))
-@@ -1663,7 +1664,7 @@
+@@ -1682,7 +1683,7 @@
      //setMainInstructionFont(*m_staticTextMain);
  
-     m_bitmapActivation->SetBitmap(getResourceImage("internet"));
+     m_bitmapActivation->SetBitmap(loadImage("internet"));
 -    m_textCtrlOfflineActivationKey->ForceUpper();
 +    //m_textCtrlOfflineActivationKey->ForceUpper();
  
diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series
index ba71e47..7ce7a97 100644
--- a/freefilesync/debian/patches/series
+++ b/freefilesync/debian/patches/series
@@ -1,7 +1,6 @@
 ffs_allow_parallel_ops.patch
 ffs_devuan.patch
-# gtk3 for obs, gtk2 for albion
-ffs_devuan_gtk2.patch
+ffs_devuan_gtk3.patch
 ffs_no_check_updates.patch
 ffs_no_wx311.patch
 ffs_sftp.patch
diff --git a/freefilesync/debian/rules b/freefilesync/debian/rules
index 405ffd3..a359bd9 100755
--- a/freefilesync/debian/rules
+++ b/freefilesync/debian/rules
@@ -15,6 +15,8 @@ export buildroot="${debuilddir}/${appname}"
 export _datadir="/usr/share"
 export _bindir="/usr/bin"
 
+export TMPDIR=/tmp
+
 %:
 	dh $@