From 7998ab58d226ccaf17496e8cf732009a381a20e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= <fc86@outlook.fr>
Date: Mon, 10 Feb 2020 10:20:39 +0100
Subject: [PATCH] updated building/packaging to qt5.13

---
 release_scripts/linux/build.sh   |  2 +-
 release_scripts/linux/package.sh | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/release_scripts/linux/build.sh b/release_scripts/linux/build.sh
index 5158e019..42846aeb 100755
--- a/release_scripts/linux/build.sh
+++ b/release_scripts/linux/build.sh
@@ -26,7 +26,7 @@ initializeVariables()
   PRODUCT_PATH="$BUILD_DIR/product"
 
   # Qt installation path. This may vary across machines
-  QT_PATH="/usr/lib/x86_64-linux-gnu/qt5"
+  QT_PATH="/home/dev/Qt/5.13.2/gcc_64"
   PLUGINS_PATH="$QT_PATH/plugins"
   GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations"
   QMAKE_PATH="$QT_PATH/bin/qmake"
diff --git a/release_scripts/linux/package.sh b/release_scripts/linux/package.sh
index 7837431e..f6adc7c6 100755
--- a/release_scripts/linux/package.sh
+++ b/release_scripts/linux/package.sh
@@ -85,13 +85,13 @@ initializeVariables()
 
   # Include Qt libraries and plugins in the package, or not
   # (this is necessary if the target system doesn't provide Qt 5.5.1)
-  BUNDLE_QT=false
+  BUNDLE_QT=true
 
   # Qt installation path. This may vary across machines
-  QT_PATH="/usr/lib/x86_64-linux-gnu/qt5"
+  QT_PATH="/home/dev/Qt/5.13.2/gcc_64"
   QT_PLUGINS_SOURCE_PATH="$QT_PATH/plugins"
   GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations"
-  QT_LIBRARY_SOURCE_PATH="$QT_PATH/.."
+  QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib"
 
   NOTIFY_CMD=`which notify-send`
   ZIP_PATH=`which zip`
@@ -131,12 +131,11 @@ notifyProgress(){
 copyQtLibrary(){
     echo -e "\t $1"
     if ls "$QT_LIBRARY_SOURCE_PATH/$1.so" &> /dev/null; then
-        cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.? "$QT_LIBRARY_DEST_PATH/"
-        cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.?.? "$QT_LIBRARY_DEST_PATH/"
-        cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.?.?.? "$QT_LIBRARY_DEST_PATH/"
+        cp -P $QT_LIBRARY_SOURCE_PATH/$1.so "$QT_LIBRARY_DEST_PATH/"
+        cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.* "$QT_LIBRARY_DEST_PATH/"
 
-        strip $QT_LIBRARY_DEST_PATH/$1.so.?.?.?
-        chmod 644 $QT_LIBRARY_DEST_PATH/$1.so.?.?.? # 644 = rw-r-r
+        strip $QT_LIBRARY_DEST_PATH/$1.so
+        chmod 644 $QT_LIBRARY_DEST_PATH/$1.so.* # 644 = rw-r-r
     else
         notifyError "$1 library not found in path: $QT_LIBRARY_SOURCE_PATH"
     fi
@@ -209,7 +208,7 @@ if $BUNDLE_QT; then
     copyQtPlugin platformthemes
     copyQtPlugin position
     copyQtPlugin printsupport
-    copyQtPlugin qtwebengine
+    #copyQtPlugin qtwebengine
     copyQtPlugin sceneparsers
     copyQtPlugin xcbglintegrations
 
@@ -219,6 +218,7 @@ if $BUNDLE_QT; then
     copyQtLibrary libQt5DBus
     copyQtLibrary libQt5Gui
     copyQtLibrary libQt5Multimedia
+    copyQtLibrary libQt5MultimediaGstTools
     copyQtLibrary libQt5MultimediaWidgets
     copyQtLibrary libQt5Network
     copyQtLibrary libQt5OpenGL
@@ -238,7 +238,9 @@ if $BUNDLE_QT; then
     copyQtLibrary libQt5XcbQpa
     copyQtLibrary libQt5Xml
     copyQtLibrary libQt5XmlPatterns
-    copyQtLibrary libqgsttools_p
+    copyQtLibrary libicuuc
+    copyQtLibrary libicui18n
+    copyQtLibrary libicudata
 fi
 
 notifyProgress "Copying Qt translations"
@@ -325,8 +327,11 @@ if $BUNDLE_QT; then
         for lib in `dpkg -S  $l | grep -v "libqt5" | grep -v "qt55" | awk -F":" '{ print $1 }'`; do
             presence=`echo ${tab[*]} | grep -c "$lib"`;
             if [ "$presence" == "0" ]; then
-                tab[$count]=$lib;
-                ((count++));
+		if [ "$lib" != "openboard" ]; then
+			 echo "adding $lib to tab"
+        	        tab[$count]=$lib;
+        	        ((count++));
+		fi;
             fi;
         done;
     done;