From a3f3a389152c95c38da9387a10bb7c0fece79311 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 Dec 2019 18:26:15 +0300
Subject: [PATCH] Fix packeged LibLZMA usage.

---
 external/auto_updates/xz/CMakeLists.txt |  2 +-
 external/qt/CMakeLists.txt              | 28 +++++++++++++++----------
 version.cmake                           |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/external/auto_updates/xz/CMakeLists.txt b/external/auto_updates/xz/CMakeLists.txt
index 7d24cb2..cd83c61 100644
--- a/external/auto_updates/xz/CMakeLists.txt
+++ b/external/auto_updates/xz/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(desktop-app::external_xz ALIAS external_xz)
 
 if (DESKTOP_APP_USE_PACKAGED)
     find_package(LibLZMA REQUIRED)
-    target_link_libraries(external_xz LibLZMA::LibLZMA)
+    target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA)
 elseif (APPLE AND NOT build_osx)
     target_link_libraries(external_xz
     INTERFACE
diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
index 2e8adc1..36e408b 100644
--- a/external/qt/CMakeLists.txt
+++ b/external/qt/CMakeLists.txt
@@ -157,21 +157,26 @@ if (LINUX)
         -static-libstdc++
         -pthread
         -rdynamic
-        -Wl,-wrap,aligned_alloc
-        -Wl,-wrap,secure_getenv
-        -Wl,-wrap,clock_gettime
-        -Wl,--no-as-needed,-lrt
     )
-    if (NOT build_linux32)
+    if (DESKTOP_APP_USE_GLIBC_WRAPS)
         target_link_options(external_qt
         INTERFACE
-            -Wl,-wrap,__divmodti4
-        )
-    else()
-        target_link_options(external_qt
-        INTERFACE
-            -Wl,-wrap,__divmoddi4
+            -Wl,-wrap,aligned_alloc
+            -Wl,-wrap,secure_getenv
+            -Wl,-wrap,clock_gettime
+            -Wl,--no-as-needed,-lrt
         )
+        if (NOT build_linux32)
+            target_link_options(external_qt
+            INTERFACE
+                -Wl,-wrap,__divmodti4
+            )
+        else()
+            target_link_options(external_qt
+            INTERFACE
+                -Wl,-wrap,__divmoddi4
+            )
+        endif()
     endif()
     target_link_static_libraries(external_qt
     INTERFACE
@@ -186,6 +191,7 @@ if (LINUX)
         xcb-render
         xkbcommon
         xkbcommon-x11
+        Xrender
         icutu
         icui18n
         icuuc
diff --git a/version.cmake b/version.cmake
index aa918c6..3d4cde3 100644
--- a/version.cmake
+++ b/version.cmake
@@ -20,7 +20,7 @@ function(desktop_app_parse_version file)
     if (NOT ${version} MATCHES "[0-9]+\.[0-9]+(\.[0-9]+(\.([0-9]+|beta)))")
         message(FATAL_ERROR "Bad version: ${version}, check ${file}")
     endif()
-    
+
     message("Version: ${version}")
 
     string(REPLACE "." ";" components ${version})