From 8c7475f620b356f4942367b7da6996933f8537d9 Mon Sep 17 00:00:00 2001
From: Roland Rossgotterer <roland.rossgotterer@gmail.com>
Date: Sun, 11 Aug 2019 12:10:21 +0200
Subject: [PATCH] Necessary fixes for custom Qt 5.12.3 built on Linux

---
 install.pri                               | 16 +++++++++-------
 installer/installbuilder/qt5-binaries.xml |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/install.pri b/install.pri
index 1693fff38..8f1b63823 100644
--- a/install.pri
+++ b/install.pri
@@ -54,10 +54,6 @@ else:unix: {
     QT5_LIBRARIES *= libQt5Xml.so.5
     QT5_LIBRARIES *= libQt5MultimediaGstTools.so.5
 
-    ICU_LIBRARIES *= libicui18n.so.56
-    ICU_LIBRARIES *= libicuuc.so.56
-    ICU_LIBRARIES *= libicudata.so.56
-
     qt5_target.path = $${PREFIX}/lib
     QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS]
 }
@@ -68,9 +64,15 @@ for (LIBRARY, QT5_LIBRARIES) {
     qt5_target.files *= $${LIBRARY_PATH}
 }
 
-for (LIBRARY, ICU_LIBRARIES) {
-    LIBRARY_PATH = $${QT5_LIBRARY_DIR}/$${LIBRARY}
-    exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH}
+unix {
+    ICU_LIBRARIES *= libicui18n.so.55
+    ICU_LIBRARIES *= libicuuc.so.55
+    ICU_LIBRARIES *= libicudata.so.55
+
+    for (LIBRARY, ICU_LIBRARIES) {
+        LIBRARY_PATH = /opt/icu55/$${LIBRARY}
+        exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH}
+    }
 }
 
 INSTALLS += qt5_target
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index 63f028862..b5601b402 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -78,13 +78,13 @@
             <platforms>linux linux-x64</platforms>
             <distributionFileList>
                 <distributionFile>
-                    <origin>../../dist/lib/libicudata.so.56</origin>
+                    <origin>../../dist/lib/libicudata.so.55</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/lib/libicui18n.so.56</origin>
+                    <origin>../../dist/lib/libicui18n.so.55</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/lib/libicuuc.so.56</origin>
+                    <origin>../../dist/lib/libicuuc.so.55</origin>
                 </distributionFile>
                 <distributionFile>
                     <origin>../../dist/lib/libQt5Core.so.5</origin>