Build: Update build configuration for Qt 6.11.1

Common/3dParty/build_3rdparty.py

@@ -26,7 +26,6 @@
     'socketio',
     'hunspell',
     'v8',
-    'icu-desktop',
     'cef',
     'qt'
 ]

Common/3dParty/cef/portfile.cmake

@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../../common.cmake")
+set(VCPKG_BINARY_REMOTE "https://cloud.nextcloud.com/public.php/dav/files/n9KYBcFYyLLCgEw")
 
 # 1. Setup hashes for each architecture (Vcpkg requires these)
 set(CEF_HASH "NOTFOUND")

Common/3dParty/icu/nc-build-cygwin.sh

@@ -1,18 +1,27 @@
 #!/bin/bash
 
 install_dir="$1"
-
-# If the install dir comes from wsl, convert that to cygwin path
 if [[ $install_dir == /mnt/* ]]; then
     install_dir="/cygdrive/${install_dir#/mnt/}"
 fi
 
 export PATH="$PATH:/usr/bin"
 export PYTHON=/usr/bin/python3
 
+# --- logging: write a clean UTF-8 log straight from bash ---------------------
+# Done before any heavy work so the real output never passes through the
+# parent's (mis-decoding) pipe. fd 3 keeps a handle to the original stderr so
+# we can still surface a short "see log" line to the console/parent.
+mkdir -p "$install_dir" || { echo "Failed to create install dir" >&2; exit 1; }
+LOG="${install_dir%/}/icu-build.log"
+exec 3>&2
+exec >"$LOG" 2>&1
+# -----------------------------------------------------------------------------
+
 abort_op()
 {
-    echo "ICU-CygWin aborted: $1" >&2
+    echo "ICU-CygWin aborted: $1" >&2                 # full context in the log
+    echo "ICU-CygWin aborted: $1 (see $LOG)" >&3      # short line to the console
     exit 1
 }
 
@@ -21,15 +30,11 @@ then
   abort_op "This script has to be run from the icu/source directory (cannot find runConfigureICU)"
 fi
 
-if [ ! -d "$install_dir" ]
-then
-  mkdir -p "$install_dir" || abort_op "Failed to create install dir"
-fi
-
 "./runConfigureICU" Cygwin/MSVC \
   --prefix="$install_dir" \
   --enable-shared \
-  --disable-static || abort_op "Configuration failed"
+  --disable-static \
+  --disable-renaming || abort_op "Configuration failed"
 
 # Build and install
 make -j$(nproc) || abort_op "Build failed"
@@ -55,4 +60,33 @@ done < <(find "$install_dir" -type l -print0)
 
 remaining=$(find "$install_dir" -type l | wc -l)
 [ "$remaining" -eq 0 ] || abort_op "Symlinks still present in install dir after dereferencing"
-echo "Install tree contains no symlinks — safe for native Windows consumers."
+echo "Install tree contains no symlinks — safe for native Windows consumers."
+
+
+# ---------------------------------------------------------------------------
+# Emit unversioned ICU DLL aliases for Qt 6.10 (loads icuuc.dll by name).
+# On Cygwin/MSVC the DLLs land in lib/ next to the import libs, not bin/, so
+# locate each versioned DLL wherever it is rather than assuming a directory.
+# [0-9] matches only versioned files (never the unversioned target → idempotent);
+# -ef skips any same-file copy.
+# ---------------------------------------------------------------------------
+for base in icuuc icuin icudt; do
+    src=$(find "$install_dir/bin" "$install_dir/lib" -maxdepth 1 \
+              -name "${base}[0-9]*.dll" 2>/dev/null | sort | tail -n1)
+    [ -n "$src" ] || abort_op "No versioned ${base}NN.dll under $install_dir (bin/ or lib/)"
+    dst="$(dirname "$src")/${base}.dll"
+    [ "$src" -ef "$dst" ] && continue
+    cp -f "$src" "$dst" || abort_op "Cannot alias $src -> $dst"
+    echo "Aliased $(basename "$src") -> ${base}.dll in $(dirname "$src")"
+done
+echo "Created unversioned ICU DLL aliases (icuuc.dll, icuin.dll, icudt.dll)."
+
+
+# Persist renaming-off for downstream consumers: ICU built itself with
+# -DU_DISABLE_RENAMING=1, but doesn't bake it into the installed headers, so
+# consumers default to renaming-ON and emit _74 symbols. Force it in uconfig.h.
+uconfig="$install_dir/include/unicode/uconfig.h"
+if ! grep -q "define U_DISABLE_RENAMING 1" "$uconfig"; then
+    sed -i 's/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/' "$uconfig"
+fi
+grep "U_DISABLE_RENAMING" "$uconfig"   # verify it now reads 1