From efd10e624be1a7a3059558b9716a392074e99c89 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Sat, 15 Jun 2019 11:36:39 -0400
Subject: freefilesync 10.13 dpkg rc1

---
 freefilesync/debian/patches/ffs_devuan.patch   | 23 +++++++++++----------
 freefilesync/debian/patches/ffs_no_wx311.patch | 28 ++++++++++++--------------
 2 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'freefilesync/debian/patches')

diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index 977fa2b..b757e8b 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -1,15 +1,16 @@
-diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-04-12 08:05:57.000000000 -0400
-+++ 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-04-12 13:58:55.050550183 -0400
-@@ -59,7 +59,7 @@
-     ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
- 
-     //if (isPortableVersion())
--    return appendSeparator(getExeFolderParentPath());
-+    return appendSeparator("/usr") + appendSeparator("share") + appendSeparator("freefilesync");
-     //else //use OS' standard paths
-     //    return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir()));
+diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/Source/base/ffs_paths.cpp
+--- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
++++ 10.13-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:36:28.178274292 -0400
+@@ -55,7 +55,8 @@
+ 
+ Zstring fff::getResourceDirPf()
+ {
+-    return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR;
++    // For Fedora, EL and Devuan, install to /usr/share/freefilesync specificly
++    return Zstr("/usr/share/freefilesync/");
  }
+ 
+ 
 diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Makefile
 --- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 08:05:57.000000000 -0400
 +++ 10.11-1/FreeFileSync/Source/Makefile	2019-04-12 14:00:16.774552362 -0400
diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch
index 871e083..a1ff0e4 100644
--- a/freefilesync/debian/patches/ffs_no_wx311.patch
+++ b/freefilesync/debian/patches/ffs_no_wx311.patch
@@ -25,20 +25,18 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp
                      toScroll += scrollSpeed * deltaSecs;
                  }
                  else
-diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-13 06:58:40.771249592 -0500
-+++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-14 21:39:14.715702415 -0500
-@@ -85,8 +85,11 @@
-     else //OS standard path (XDG layout): ~/.config/FreeFileSync
-     {
-         //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
--        wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
--        cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
-+
-+        // Fedora 28 does not have wxGTK 3.1.1 yet.
-+        // So subsitute a hard-coded name instead of requesting file layout of XDG
-+        //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
-+        cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
-     }
+diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/Source/base/ffs_paths.cpp
+--- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
++++ 10.13-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:26:56.794422701 -0400
+@@ -75,8 +75,9 @@
+     Zstring cfgFolderPath;
+     //OS standard path (XDG layout): ~/.config/FreeFileSync
+     //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
+-    wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
+-    cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
++    // Fedora does not have wxGTK 3.1.1 which is the dev branch.
++    //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
++    cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
+ 
  
      std::call_once(onceFlagCreateCfgPath, [&]
-- 
cgit