diff options
Diffstat (limited to 'freefilesync/revert_zenju_aggressive_upstreamisms.patch')
| -rw-r--r-- | freefilesync/revert_zenju_aggressive_upstreamisms.patch | 103 |
1 files changed, 41 insertions, 62 deletions
diff --git a/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch index de8d5e9..fda8cc2 100644 --- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/revert_zenju_aggressive_upstreamisms.patch @@ -1,6 +1,7 @@ Message: Some of these can be traced back to version 10.23 which was the last to not use <unordered_map> -Date: 2021-05-10 -Version: 11.10 +Date: 2022-04-18 +Version: 11.20 +Author: bgstack15 diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h --- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400 +++ 10.24-1/wx+/choice_enum.h 2020-05-17 18:53:59.893685507 -0400 @@ -154,17 +155,40 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu { SetLabel(label); diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/wx+/dc.h ---- 11.9-0/wx+/dc.h 2021-04-05 10:57:36.518697734 -0400 -+++ 11.9-1/wx+/dc.h 2021-04-05 11:11:21.809650868 -0400 -@@ -69,9 +69,6 @@ +--- 11.20-0/wx+/dc.h 2022-04-18 09:49:31.921386600 -0400 ++++ 11.20-1/wx+/dc.h 2022-04-18 10:12:04.667907393 -0400 +@@ -12,7 +12,7 @@ + #include <zen/basic_math.h> + #include <wx/dcbuffer.h> //for macro: wxALWAYS_NATIVE_DOUBLE_BUFFER + #include <wx/dcscreen.h> +-#include <wx/bmpbndl.h> ++//#include <wx/bmpbndl.h> + #include <gtk/gtk.h> + + +@@ -92,9 +92,6 @@ inline int getDPI() { --#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS --#error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined? +-#ifndef wxHAS_DPI_INDEPENDENT_PIXELS +-#error why is wxHAS_DPI_INDEPENDENT_PIXELS not defined? -#endif //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114 //=> requires general fix at wxWidgets-level + +@@ -119,11 +116,11 @@ + + + inline +-wxBitmapBundle toBitmapBundle(const wxImage& img /*expected to be DPI-scaled!*/) ++wxBitmap toBitmapBundle(const wxImage& img /*expected to be DPI-scaled!*/) + { + //return wxBitmap(img, -1 /*depth*/, static_cast<double>(getDPI()) / defaultDpi); not (yet) implemented + wxBitmap bmpScaled(img); +- bmpScaled.SetScaleFactor(static_cast<double>(getDPI()) / defaultDpi); ++ //bmpScaled.SetScaleFactor(static_cast<double>(getDPI()) / defaultDpi); + return bmpScaled; + } diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/graph.h 11.1-2/wx+/graph.h --- 11.1-1/wx+/graph.h 2020-09-01 19:07:43.731122359 -0400 @@ -303,58 +327,13 @@ 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 @@ + wxMemoryDC dc(bmpSquare); + drawInsetRectangle(dc, wxRect(bmpSquare.GetSize()), fastFromDIP(1), borderCol, fillCol); + } +- bmpSquare.SetScaleFactor(static_cast<double>(getDPI()) / defaultDpi); + return bmpSquare; + }; + pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim())); |