From 0fd23e1ea51eea067c3b08a09f8f0a2d9b3c6509 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 1 Sep 2020 20:25:11 +0400
Subject: [PATCH 1/4] Fix Qt dependencies

---
 external/ffmpeg/CMakeLists.txt | 4 ++--
 external/qt/CMakeLists.txt     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/external/ffmpeg/CMakeLists.txt b/external/ffmpeg/CMakeLists.txt
index c556ce3..bd9a1cf 100644
--- a/external/ffmpeg/CMakeLists.txt
+++ b/external/ffmpeg/CMakeLists.txt
@@ -68,13 +68,13 @@ else()
             va-drm
             va
             vdpau
-            Xi
+            wayland-client
             Xext
             Xfixes
-            Xrender
         )
         target_link_libraries(external_ffmpeg
         INTERFACE
+            X11
             drm
             pthread
         )
diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
index b93b456..b513562 100644
--- a/external/qt/CMakeLists.txt
+++ b/external/qt/CMakeLists.txt
@@ -335,11 +335,11 @@ else()
             wayland-egl
             wayland-cursor
             wayland-client
-            xcb-shm
-            xcb-xfixes
-            xcb-render
             xkbcommon
             xkbcommon-x11
+            Xi
+            Xext
+            Xfixes
             Xrender
             ffi
             icutu

From 8ed7b65ecadc42992b19d230a1d902960b917de2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 1 Sep 2020 22:32:34 +0400
Subject: [PATCH 2/4] Build Qt without ICU

---
 external/qt/CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
index b513562..6a379a6 100644
--- a/external/qt/CMakeLists.txt
+++ b/external/qt/CMakeLists.txt
@@ -342,10 +342,6 @@ else()
             Xfixes
             Xrender
             ffi
-            icutu
-            icui18n
-            icuuc
-            icudata
         )
         if (DESKTOP_APP_USE_GLIBC_WRAPS)
             target_link_libraries(external_qt
@@ -356,6 +352,7 @@ else()
         endif()
         target_link_libraries(external_qt
         INTERFACE
+            desktop-app::external_zlib
             ICE
             SM
             fontconfig

From c9d1ac50d3ed77f424f5a8e12c9924df2c35440c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Sep 2020 19:40:03 +0300
Subject: [PATCH 3/4] Load Rstrtmgr dynamically.

---
 options_win.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/options_win.cmake b/options_win.cmake
index 4223488..4635992 100644
--- a/options_win.cmake
+++ b/options_win.cmake
@@ -86,7 +86,6 @@ INTERFACE
     Version
     Dwmapi
     Wtsapi32
-    Rstrtmgr
     Crypt32
 )
 

From 5d6f8ebee32e334543b3f1fa43907a700bf8bde7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Sep 2020 19:08:04 +0300
Subject: [PATCH 4/4] Downgrade to C++17 on Apple Clang for now.

See https://github.com/ericniebler/range-v3/pull/1570.
---
 init_target.cmake | 2 +-
 options_mac.cmake | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/init_target.cmake b/init_target.cmake
index 3a4806b..fc299bb 100644
--- a/init_target.cmake
+++ b/init_target.cmake
@@ -5,7 +5,7 @@
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
 set(MAXIMUM_CXX_STANDARD cxx_std_20)
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(MAXIMUM_CXX_STANDARD cxx_std_17)
 endif()
 
diff --git a/options_mac.cmake b/options_mac.cmake
index 92d9aaa..7acd4f9 100644
--- a/options_mac.cmake
+++ b/options_mac.cmake
@@ -38,6 +38,7 @@ INTERFACE
     -Wno-sign-compare
     -Wno-unknown-attributes
     -Wno-pragma-system-header-outside-header
+    -Wno-range-loop-analysis
 )
 
 if (DESKTOP_APP_SPECIAL_TARGET)