From 22b099429aa9368fe0339ee48bcf6dbcdd3ac8d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 Jan 2020 16:28:17 +0300
Subject: [PATCH] Link some libraries dynamically on Linux.

Some libraries that should be on all target systems could be linked
dynamically, list taken from:

https://github.com/AppImage/pkg2appimage/blob/master/excludelist

This should fix some problems with fontconfig version mismatch.
---
 external/ffmpeg/CMakeLists.txt |  5 ++++-
 external/qt/CMakeLists.txt     | 12 ++++++------
 external/zlib/CMakeLists.txt   |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/external/ffmpeg/CMakeLists.txt b/external/ffmpeg/CMakeLists.txt
index 843ca09..f2e617a 100644
--- a/external/ffmpeg/CMakeLists.txt
+++ b/external/ffmpeg/CMakeLists.txt
@@ -54,11 +54,14 @@ else()
             va-drm
             va
             vdpau
-            drm
             Xi
             Xext
             Xfixes
             Xrender
         )
+        target_link_libraries(external_ffmpeg
+        INTERFACE
+          drm
+        )
     endif()
 endif()
diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
index 8b9be68..a1f7834 100644
--- a/external/qt/CMakeLists.txt
+++ b/external/qt/CMakeLists.txt
@@ -213,12 +213,6 @@ else()
         endif()
         target_link_static_libraries(external_qt
         INTERFACE
-            SM
-            ICE
-            fontconfig
-            freetype
-            expat
-            z
             xcb-shm
             xcb-xfixes
             xcb-render
@@ -239,6 +233,12 @@ else()
         endif()
         target_link_libraries(external_qt
         INTERFACE
+            ICE
+            SM
+            fontconfig
+            freetype
+            expat
+            z
             xcb
             X11
             X11-xcb
diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt
index 515ff25..1e33b90 100644
--- a/external/zlib/CMakeLists.txt
+++ b/external/zlib/CMakeLists.txt
@@ -63,5 +63,5 @@ elseif (APPLE AND NOT build_osx)
 elseif (APPLE)
     target_link_libraries(external_zlib INTERFACE /usr/local/lib/libz.a)
 else()
-    target_link_static_libraries(external_zlib INTERFACE z)
+    target_link_libraries(external_zlib INTERFACE z)
 endif()