2 files changed, 1 insertions, 56 deletions
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc
index 2397367..e2ca5a6 100644
--- a/freefilesync/debian/freefilesync+devuan.dsc
+++ b/freefilesync/debian/freefilesync+devuan.dsc
@@ -6,7 +6,7 @@ Version: 11.20-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12~), g++-10, imagemagick, libbrotli-dev, libcurl4-openssl-dev (>= 7.82.0), libglibmm-2.4-dev, libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, libgtk-3-dev, libwxgtk3.0-gtk3-dev, libfontconfig-dev
+Build-Depends: debhelper (>= 12~), g++-11, imagemagick, libbrotli-dev, libcurl4-openssl-dev (>= 7.82.0), libglibmm-2.4-dev, libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, libgtk-3-dev, libwxgtk3.0-gtk3-dev, libfontconfig-dev
 Package-List:
  freefilesync deb utils optional arch=any
 Files:
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
index 570b244..fda8cc2 100644
--- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch
@@ -327,61 +327,6 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+
  
      //get rid of margins and space between text blocks/"paragraphs"
      richCtrl.SetMargins({0, 0});
-Message: Revert __cpp_lib_atomic_wait which is not yet implemented in g++-10 or clang++-11 on Debian
-How does Zenju compile this?!
-Date: 2021-05-10
---- 11.9-0/zen/globals.h	2021-05-10 08:10:14.755776667 -0400
-+++ 11.9-1/zen/globals.h	2021-05-10 09:17:25.122241641 -0400
-@@ -223,7 +223,11 @@
- void PodSpinMutex::lock()
- {
-     while (!tryLock())
-+#ifdef __cpp_lib_atomic_wait
-         flag_.wait(true, std::memory_order_relaxed);
-+#else
-+        ;
-+#endif
- }
- 
- 
-@@ -231,7 +235,9 @@
- void PodSpinMutex::unlock()
- {
-     flag_.clear(std::memory_order_release);
-+#ifdef __cpp_lib_atomic_wait
-     flag_.notify_one();
-+#endif
- }
- 
-
-Message: This one should work; it's a c++17 specification, but it doesn't work.
-Date: 2021-05-10
-diff -aur 11.10-0/zen/legacy_compiler.cpp 11.10-1/zen/legacy_compiler.cpp
---- 11.10-0/zen/legacy_compiler.cpp	2021-05-10 08:10:14.755776667 -0400
-+++ 11.10-1/zen/legacy_compiler.cpp	2021-05-10 10:06:01.998079701 -0400
-@@ -14,15 +14,17 @@
- 
- double zen::fromChars(const char* first, const char* last)
- {
--    double num = 0;
--    [[maybe_unused]] const std::from_chars_result rv = std::from_chars(first, last, num);
--    return num;
-+    return std::strtod(std::string(first, last).c_str(), nullptr);
- }
- 
- 
- const char* zen::toChars(char* first, char* last, double num)
- {
--    const std::to_chars_result rv = std::to_chars(first, last, num);
--    return rv.ec == std::errc{} ? rv.ptr : first;
-+    const size_t bufSize = last - first;
-+    const int charsWritten = std::snprintf(first, bufSize, "%g", num);
-+    //C99: returns number of chars written if successful, < 0 or >= bufferSize on failure
-+
-+    return 0 <= charsWritten && charsWritten < static_cast<int>(bufSize) ?
-+           first + charsWritten : first;
- }
- 
 --- 11.20-0/FreeFileSync/Source/ui/progress_indicator.cpp	2022-04-18 09:49:31.917386558 -0400
 +++ 11.20-1/FreeFileSync/Source/ui/progress_indicator.cpp	2022-04-18 11:02:10.988781908 -0400
 @@ -882,7 +885,6 @@