From cc95825594fc99e7537198003cab4a0dd1172bcb Mon Sep 17 00:00:00 2001
From: Matthias Grob <maetugr@gmail.com>
Date: Mon, 1 Feb 2021 14:28:37 +0100
Subject: [PATCH] PostLink: only stage icu 56 if it exists

otherwise use the installed version.
E.g. at the time of writing latest version 68 works great.
---
 QGCPostLinkCommon.pri | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri
index 56b1348..ff3b2d1 100644
--- a/QGCPostLinkCommon.pri
+++ b/QGCPostLinkCommon.pri
@@ -104,12 +104,17 @@ LinuxBuild {
         libicui18n.so* \
         libQt5TextToSpeech.so.5
 
-    !contains(DEFINES, __rasp_pi2__) {
+    exists($$[QT_INSTALL_LIBS]/libicudata.so.56) {
         # Some Qt distributions link with *.so.56
         QT_LIB_LIST += \
             libicudata.so.56 \
             libicui18n.so.56 \
             libicuuc.so.56
+    } else {
+        QT_LIB_LIST += \
+            libicudata.so \
+            libicui18n.so \
+            libicuuc.so
     }
 
     for(QT_LIB, QT_LIB_LIST) {