From 7ea313a72286ce5f21b4126b48a26760deea1ed5 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Mon, 15 Apr 2024 00:23:25 +0200
Subject: [PATCH] Fixing Qt6 builds for MINGW

---
 scripts/deploy-win-mingw.sh  | 16 +++++++++-------
 scripts/deploy-win-ucrt64.sh | 16 +++++++++-------
 scripts/klayout-inst.nsis    |  3 +++
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/scripts/deploy-win-mingw.sh b/scripts/deploy-win-mingw.sh
index f28c9379f..a4391ef2b 100644
--- a/scripts/deploy-win-mingw.sh
+++ b/scripts/deploy-win-mingw.sh
@@ -116,7 +116,7 @@ src=$pwd/src
 scripts=$pwd/scripts
 
 # Update in NSIS script too:
-plugins="audio generic iconengines imageformats platforms printsupport sqldrivers styles"
+plugins="audio generic iconengines imageformats multimedia networkinformation platforms printsupport sqldrivers styles tls"
 
 # read the current version
 . ./version.sh
@@ -157,12 +157,14 @@ cp $mingw_inst/etc/ssl/cert.pem $target
 
 echo "Installing plugins .."
 for p in $plugins; do
-  echo "  $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p .."
-  cp -R $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p $target
-  # remove the debug versions - otherwise they pull in the debug Qt libs
-  shopt -s nullglob
-  rm -f $target/$p/*d.dll $target/$p/*.dll.debug
-  shopt -u nullglob
+  if [ -e $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p ]; then
+    echo "  $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p .."
+    cp -R $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p $target
+    # remove the debug versions - otherwise they pull in the debug Qt libs
+    shopt -s nullglob
+    rm -f $target/$p/*d.dll $target/$p/*.dll.debug
+    shopt -u nullglob
+  fi
 done
 
 # ----------------------------------------------------------
diff --git a/scripts/deploy-win-ucrt64.sh b/scripts/deploy-win-ucrt64.sh
index 0e98fb053..49ad15dff 100644
--- a/scripts/deploy-win-ucrt64.sh
+++ b/scripts/deploy-win-ucrt64.sh
@@ -99,7 +99,7 @@ build=$pwd/build-release-$arch$KLAYOUT_BUILD_SUFFIX
 src=$pwd/src
 scripts=$pwd/scripts
 # Update in NSIS script too:
-plugins="audio generic iconengines imageformats platforms printsupport sqldrivers styles"
+plugins="audio generic iconengines imageformats multimedia networkinformation platforms printsupport sqldrivers styles tls"
 
 # read the current version
 . ./version.sh
@@ -141,11 +141,13 @@ cp $ucrt_inst/etc/ssl/cert.pem $target
 
 echo "Installing plugins .."
 for p in $plugins; do
-  cp -R $ucrt_inst/share/qt5/plugins/$p $target
-  # remove the debug versions - otherwise they pull in the debug Qt libs
-  shopt -s nullglob
-  rm -f $target/$p/*d.dll $target/$p/*.dll.debug
-  shopt -u nullglob
+  if [ -e $ucrt_inst/share/qt5/plugins/$p ]; then
+    cp -R $ucrt_inst/share/qt5/plugins/$p $target
+    # remove the debug versions - otherwise they pull in the debug Qt libs
+    shopt -s nullglob
+    rm -f $target/$p/*d.dll $target/$p/*.dll.debug
+    shopt -u nullglob
+  fi
 done
 
 # ----------------------------------------------------------
@@ -264,7 +266,7 @@ while [ "$new_libs" != "" ]; do
       cp $ucrt_inst/bin/$l $l
       new_libs="$new_libs $l"
     elif [ -e "${ucrt_vssdk}/$l" ] && ! [ -e $l ]; then
-      echo "Copying binary installation partial $ucrt_inst/bin/$l -> $l"
+      echo "Copying binary installation partial ${ucrt_vssdk}/${l} -> $l"
       cp "${ucrt_vssdk}/${l}" "$l"
       new_libs="$new_libs $l"
     fi  
diff --git a/scripts/klayout-inst.nsis b/scripts/klayout-inst.nsis
index 9ba4ebf42..220a06678 100644
--- a/scripts/klayout-inst.nsis
+++ b/scripts/klayout-inst.nsis
@@ -76,10 +76,13 @@ section
   file /r generic
   file /r iconengines
   file /r imageformats
+  file /r multimedia
+  file /r networkinformation
   file /r platforms
   file /r printsupport
   file /r sqldrivers
   file /r styles
+  file /r tls
   file /r lib
   file /oname=${EXENAME}.exe ${EXEBASE}.exe
   file /oname=${EXENAME_VO}.exe ${EXEBASE}.exe