summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_el.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-12-27 17:39:04 +0000
committerB Stack <bgstack15@gmail.com>2019-12-27 17:39:04 +0000
commitb40c382a3d80f83130fe011e99aee3b64c469c81 (patch)
treebd720ccfbafe56fe614a349592e5a8dc3fe2829a /freefilesync/ffs_el.patch
parentMerge branch 'updates' into 'master' (diff)
parentfix ffs_el.patch serialize.h (diff)
downloadstackrpms-b40c382a3d80f83130fe011e99aee3b64c469c81.tar.gz
stackrpms-b40c382a3d80f83130fe011e99aee3b64c469c81.tar.bz2
stackrpms-b40c382a3d80f83130fe011e99aee3b64c469c81.zip
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 10.19 See merge request bgstack15/stackrpms!110
Diffstat (limited to 'freefilesync/ffs_el.patch')
-rw-r--r--freefilesync/ffs_el.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index d3849f3..bf4fa20 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -75,17 +75,17 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim
#treat as system headers so that warnings are hidden:
CXXFLAGS += -isystem/usr/include/gtk-2.0
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 07:59:45.318160616 -0400
-+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 10:19:57.228913439 -0400
-@@ -115,6 +115,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 CentOS 7";
-
- GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
++ build += L" for CentOS 7/Fedora 29";
++
+ build += SPACED_BULLET;
+ build += formatTime<wxString>(FORMAT_DATE, getCompileTime());
diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/app_main.h
--- 10.11-0/wx+/app_main.h 2019-04-12 07:59:44.936143019 -0400
@@ -110,13 +110,13 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/ring_buffer.h 10.11-1/z
namespace zen
-diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/serialize.h 10.11-1/zen/serialize.h
+diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/serialize.h 10.19-1/zen/serialize.h
--- 10.11-0/zen/serialize.h 2019-04-12 07:59:46.080195719 -0400
-+++ 10.11-1/zen/serialize.h 2019-04-12 10:19:57.229913463 -0400
-@@ -9,6 +9,7 @@
-
++++ 10.19-1/zen/serialize.h 2019-12-27 11:35:50.379901321 -0500
+@@ -10,6 +10,7 @@
#include <functional>
#include <cstdint>
+ #include <stdexcept>
+#include <cstddef>
#include "string_base.h"
//keep header clean from specific stream implementations! (e.g.file_io.h)! used by abstract.h!
bgstack15