submodules: update nightly branch

README.rst

@@ -40,7 +40,8 @@ On Linux
 
     ./build.py --dependencies
 
-Your distribution's package manager will be used.
+Your distribution's package manager will be used. Adding the ``-y`` flag will install the 
+dependencies non-interactively (assumes yes at all prompts).
 
 2. Build and install locally under this repository:
 

client-android @ 0272a6c3

-Subproject commit da9ba0e770dec9ce059aa27ae1f17e2594b20ac5
+Subproject commit 0272a6c3bb2c995f3852b78e29499b472e45aaf5

client-ios @ 10335f25

-Subproject commit ba96ab4f0d1529ad5386f8542d3d20f2ba0ea98a
+Subproject commit 10335f25c5b4c70ab91dcb72973d472885691928

client-macosx @ 188308d7

-Subproject commit c35095bb31662e5655e591f31ce1c85bb9ba29c2
+Subproject commit 188308d7dccca0c9e58275df7c6b31a2c8e5f553

client-qt @ e0ed0ea2

-Subproject commit cd027db503d492696a1b4c71cc4b9add4f0e9776
+Subproject commit e0ed0ea2f3cf5a6b5d4ce07d7a1aac820eee2ce7

client-uwp @ 4b639e9a

-Subproject commit f15a1224786a83b507cbcab624fc41e9ea1bfb67
+Subproject commit 4b639e9a903931bab09292b4d93a4de6d531ae4c

daemon @ 4ff4a32d

-Subproject commit fbdc6a195759e2123512f6dc4f7e1e01bd37b3b8
+Subproject commit 4ff4a32d66194eb953017709f52fd33a73e68240

lrc @ b4fca6e5

-Subproject commit c5bca2933fb02ef7f81e8fe0772801a4f97fd1f5
+Subproject commit b4fca6e573638ef2a08f870e8ef2b75369f7b309

lrc-gnome @ b4fca6e5

-Subproject commit c5bca2933fb02ef7f81e8fe0772801a4f97fd1f5
+Subproject commit b4fca6e573638ef2a08f870e8ef2b75369f7b309

plugins @ 3fcc6219

-Subproject commit 7bfad26ae4eeb656733d409aa88cf0fcae69d7a5
+Subproject commit 3fcc62199f147b16dfa2662a102ccf0619885e24

scripts/build-windows.py

@@ -24,13 +24,13 @@ def build_daemon(parsed_args):
 
 def build_lrc(parsed_args):
     make_cmd = os.path.dirname(this_dir) + '\\lrc\\make-lrc.py'
-    execute_cmd('python ' + make_cmd + ' -q ' + parsed_args.qtver)
+    execute_cmd('python ' + make_cmd)
 
 
 def build_client(parsed_args):
     os.chdir('./client-qt')
     execute_cmd('python make-client.py init')
-    execute_cmd('python make-client.py' + ' -q ' + parsed_args.qtver)
+    execute_cmd('python make-client.py')
 
 
 def parse_args():
@@ -40,8 +40,6 @@ def parse_args():
                     help='Windows use only, specify Visual Studio toolset version')
     ap.add_argument('--sdk', default='', type=str,
                     help='Windows use only, specify Windows SDK version')
-    ap.add_argument('--qtver', default='5.15.0',
-                    help='Sets the Qt version to build with')
 
     parsed_args = ap.parse_args()
 

scripts/install.sh

@@ -11,23 +11,24 @@ export OSTYPE
   # -p: number of processors to use
   # -u: disable use of privileges (sudo) during install
   # -W: disable libwrap and shared library
+  # -w: do not use Qt WebEngine
 
 set -ex
 
 # Qt_MIN_VER required for client-qt
-QT6_MIN_VER="6.2"
+QT_MIN_VER="6.2"
 
 debug=
 global=false
 static=''
 client=''
-qt6ver=''
-qt6path=''
+qtpath=''
 proc='1'
 priv_install=true
 enable_libwrap=true
+enable_webengine=true
 
-while getopts gsc:dq:Q:P:p:uW OPT; do
+while getopts gsc:dQ:P:p:uWw OPT; do
   case "$OPT" in
     g)
       global='true'
@@ -41,11 +42,8 @@ while getopts gsc:dq:Q:P:p:uW OPT; do
     d)
       debug=true
     ;;
-    q)
-      qt6ver="${OPTARG}"
-    ;;
     Q)
-      qt6path="${OPTARG}"
+      qtpath="${OPTARG}"
     ;;
     P)
       prefix="${OPTARG}"
@@ -59,6 +57,9 @@ while getopts gsc:dq:Q:P:p:uW OPT; do
     W)
       enable_libwrap='false'
     ;;
+    w)
+      enable_webengine='false'
+    ;;
     \?)
       exit 1
     ;;
@@ -124,28 +125,27 @@ make -j"${proc}" V=1
 make_install "${global}" "${priv_install}"
 
 # For the client-qt, verify system's version if no path provided
-if [ "${client}" = "client-qt" ] && [ -z "$qt6path" ]; then
-    sys_qt6ver=""
-    if command -v qmake &> /dev/null; then
-        sys_qt6ver=$(qmake -v)
+if [ "${client}" = "client-qt" ] && [ -z "$qtpath" ]; then
+    sys_qtver=""
+    if command -v qmake6 &> /dev/null; then
+        sys_qtver=$(qmake6 -v)
     elif command -v qmake-qt6 &> /dev/null; then
-        sys_qt6ver=$(qmake-qt6 -v)   # Fedora
-    elif command -v qmake6 &> /dev/null; then
-        sys_qt6ver=$(qmake6 -v) # macOS
+        sys_qtver=$(qmake-qt6 -v) # Fedora
+    elif command -v qmake &> /dev/null; then
+        sys_qtver=$(qmake -v)
     else
         echo "No valid Qt found"; exit 1;
     fi
 
-    sys_qt6ver=${sys_qt6ver#*Qt version}
-    sys_qt6ver=${sys_qt6ver%\ in\ *}
+    sys_qtver=${sys_qtver#*Qt version}
+    sys_qtver=${sys_qtver%\ in\ *}
 
-    installed_qt6ver=$(echo "$sys_qt6ver" | cut -d'.' -f 2)
-    required_qt6ver=$(echo $QT6_MIN_VER | cut -d'.' -f 2)
+    installed_qtver=$(echo "$sys_qtver" | cut -d'.' -f 2)
+    required_qtver=$(echo $QT_MIN_VER | cut -d'.' -f 2)
 
-    if [[ $installed_qt6ver -ge $required_qt6ver ]] ; then
-        # Disable qt6path and qt6ver in order to use system's Qt
-        qt6path=""
-        qt6ver=""
+    if [[ $installed_qtver -ge $required_qtver ]] ; then
+        # Set qtpath to empty in order to use system's Qt.
+        qtpath=""
     else
         echo "No valid Qt found"; exit 1;
     fi
@@ -156,7 +156,7 @@ cd "${TOP}/lrc"
 mkdir -p "${BUILDDIR}"
 cd "${BUILDDIR}"
 # Compute LRC CMake flags
-lrc_cmake_flags=(-DCMAKE_PREFIX_PATH="${qt6path}"
+lrc_cmake_flags=(-DCMAKE_PREFIX_PATH="${qtpath}"
                  -DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
                  -DENABLE_LIBWRAP="${enable_libwrap}"
                  $static)
@@ -177,9 +177,10 @@ mkdir -p "${BUILDDIR}"
 cd "${BUILDDIR}"
 
 client_cmake_flags=(-DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
-                    -DCMAKE_PREFIX_PATH="${qt6path}")
+                    -DCMAKE_PREFIX_PATH="${qtpath}")
 
 if [ "${client}" = "client-qt" ]; then
+    client_cmake_flags+=(-DWITH_WEBENGINE="${enable_webengine}")
     if [ "${global}" = "true" ]; then
         client_cmake_flags+=(${prefix:+"-DCMAKE_INSTALL_PREFIX=$prefix"}
                              $static)