From 9ee86228fb287d93b79c83bd684614eb988cd8f2 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 7 Jun 2022 15:38:20 -0400 Subject: ffs: major rewrite of spec for el8 and fc --- freefilesync/ffs_no_gcc12.patch | 2 ++ 1 file changed, 2 insertions(+) (limited to 'freefilesync/ffs_no_gcc12.patch') diff --git a/freefilesync/ffs_no_gcc12.patch b/freefilesync/ffs_no_gcc12.patch index 88b0d27..666036d 100644 --- a/freefilesync/ffs_no_gcc12.patch +++ b/freefilesync/ffs_no_gcc12.patch @@ -2,6 +2,8 @@ Message: Because we do not use gcc 12, we have an error with unordered_map and s Author: zensubz Date-Modified: 2022-05-24 Version: 11.21 +Source: https://freefilesync.org/forum/viewtopic.php?t=9376&p=34044#p34044 +Distro: any distro with g++ < 12 --- a/FreeFileSync/Source/base/db_file.cpp +++ b/FreeFileSync/Source/base/db_file.cpp @@ -642,7 +642,7 @@ -- cgit From 83c49830d173c2f763960417221d9826ec4add94 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Mon, 27 Jun 2022 11:13:49 -0400 Subject: ffs 11.22 rpm rc1 --- freefilesync/ffs_no_gcc12.patch | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'freefilesync/ffs_no_gcc12.patch') diff --git a/freefilesync/ffs_no_gcc12.patch b/freefilesync/ffs_no_gcc12.patch index 666036d..b25edac 100644 --- a/freefilesync/ffs_no_gcc12.patch +++ b/freefilesync/ffs_no_gcc12.patch @@ -1,7 +1,7 @@ Message: Because we do not use gcc 12, we have an error with unordered_map and std::pair. Author: zensubz -Date-Modified: 2022-05-24 -Version: 11.21 +Date-Modified: 2022-06-27 +Version: 11.22 Source: https://freefilesync.org/forum/viewtopic.php?t=9376&p=34044#p34044 Distro: any distro with g++ < 12 --- a/FreeFileSync/Source/base/db_file.cpp @@ -61,14 +61,3 @@ Distro: any distro with g++ < 12 //------------------------------------------------------------------ FolderContainer() = default; ---- a/zen/json.h -+++ b/zen/json.h -@@ -41,7 +41,7 @@ - - Type type = Type::null; - std::string primVal; //for primitive types -- std::unordered_map objectVal; //"[...] most implementations of JSON libraries do not accept duplicate keys [...]" => fine! -+ std::map objectVal; //"[...] most implementations of JSON libraries do not accept duplicate keys [...]" => fine! - std::vector arrayVal; - }; - -- cgit