diff options
| author | B Stack <bgstack15@gmail.com> | 2020-06-21 16:14:36 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-06-21 16:14:36 -0400 |
| commit | 39d4fd9cfb9ed7ecbe950b895ddc2311d12eaa2c (patch) | |
| tree | b5d8be41abf476be95000ac8559a350c2f02e565 /freefilesync/revert_zenju_aggressive_upstreamisms.patch | |
| parent | dpkg for gtk2 (diff) | |
| download | stackrpms-39d4fd9cfb9ed7ecbe950b895ddc2311d12eaa2c.tar.gz stackrpms-39d4fd9cfb9ed7ecbe950b895ddc2311d12eaa2c.tar.bz2 stackrpms-39d4fd9cfb9ed7ecbe950b895ddc2311d12eaa2c.zip | |
WIP: ffs rpm
It appears I cannot easily revert to std=c++17 behavior, so all
releases with gcc < 10 will fail.
Diffstat (limited to 'freefilesync/revert_zenju_aggressive_upstreamisms.patch')
| -rw-r--r-- | freefilesync/revert_zenju_aggressive_upstreamisms.patch | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch index 0da4e06..355f5f0 100644 --- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/revert_zenju_aggressive_upstreamisms.patch @@ -16,20 +16,18 @@ libwxgtk3.0-dev_3.0.4+dfsg-14_i386.deb wx3.0-headers_3.0.4+dfsg-14_all.deb wx-common_3.0.4+dfsg-14_amd64.deb wx-common_3.0.4+dfsg-14_i386.deb -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/legacy_compiler.h 10.24-1/zen/legacy_compiler.h ---- 10.24-0/zen/legacy_compiler.h 2020-05-17 13:44:27.542140458 -0400 -+++ 10.24-1/zen/legacy_compiler.h 2020-05-17 14:07:49.115166339 -0400 -@@ -7,9 +7,6 @@ +diff -x '*.rej' -x '*.orig' -Naur 10.25-0/zen/legacy_compiler.h 10.25-1/zen/legacy_compiler.h +--- 10.25-0/zen/legacy_compiler.h 2020-06-19 16:17:16.000000000 -0400 ++++ 10.25-1/zen/legacy_compiler.h 2020-06-20 21:05:15.159166242 -0400 +@@ -7,7 +7,6 @@ #ifndef LEGACY_COMPILER_H_839567308565656789 #define LEGACY_COMPILER_H_839567308565656789 - #include <numbers> //C++20 -- -- #include <span> //requires C++20 -@@ -21,8 +18,53 @@ +@@ -20,6 +19,53 @@ //--------------------------------------------------------------------------------- @@ -55,10 +53,10 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/legacy_compiler.h 10.2 + + const_iterator begin() const { return data_; } + const_iterator end () const { return data_ + size_; } - ++ + const_iterator cbegin() const { return begin(); } + const_iterator cend () const { return end (); } - ++ + T* data() const { return data_; } + size_t size() const { return size_; } + bool empty() const { return size_ == 0; } @@ -80,22 +78,22 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/legacy_compiler.h 10.2 +const double sqrt2 = 1.41421356237309504880; +const double ln2 = 0.693147180559945309417; +} - } -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/string_base.h 10.24-1/zen/string_base.h ---- 10.24-0/zen/string_base.h 2020-05-17 13:44:27.554140569 -0400 -+++ 10.24-1/zen/string_base.h 2020-05-17 14:09:44.164244361 -0400 -@@ -12,7 +12,9 @@ + } +diff -x '*.rej' -x '*.orig' -Naur 10.25-0/zen/string_base.h 10.25-1/zen/string_base.h +--- 10.25-0/zen/string_base.h 2020-06-19 16:17:16.000000000 -0400 ++++ 10.25-1/zen/string_base.h 2020-06-20 21:06:05.705698462 -0400 +@@ -11,7 +11,9 @@ + #include <cassert> #include <cstdint> #include <atomic> - #include "string_tools.h" +#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison #include <compare> +#endif + #include "string_tools.h" - //Zbase - a policy based string class optimizing performance and flexibility @@ -293,15 +295,29 @@ }; |