misc: bump daemon

Change-Id: I38901aa3e8b5db4ec14c70f9b6df65a4f43eaad4

.clang-tidy

@@ -0,0 +1 @@
+Checks: '-*,analyzer-cplusplus.NewDeleteLeaks'

.gitignore

@@ -1,9 +1,18 @@
 *.user
 doc/Doxyfile
 
+### VisualStudioCode ###
+.vscode/**/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+**/.history
+
 GeneratedFiles/
-.vs/
-.vscode/
 x64/
 x86/
 [wW]in32/

.vscode/launch.json

@@ -0,0 +1,49 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Jami-Client-Debug",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "",
+            "linux":{
+                "MIMode": "gdb",
+                "program": "${workspaceFolder}/build/jami",
+                "args": [
+                    "-d",
+                ],
+            },
+            "osx": {
+                "MIMode": "lldb",
+                "program": "${workspaceFolder}/build/Jami.app/Contents/MacOS/Jami",
+                "environment": [
+                    {
+                        "name": "NO_COLOR",
+                        "value": "true",
+                    }
+                ],
+            },
+            "cwd": "${workspaceFolder}",
+            "preLaunchTask": "cmake-build",
+            "externalConsole": false, // A macOS dev may want to set this to true.
+        },
+        {
+            // Using this configuration will require manually reconfiguring the project using
+            // build.py --no-libwrap, otherwise the daemon executable will not be built and the
+            // client will not be built with ENABLE_LIBWRAP=False.
+            "name": "Jami-Daemon-Debug",
+            "type": "cppdbg",
+            "request": "launch",
+            "linux": {
+                "MIMode": "gdb",
+                "program": "${workspaceFolder}/daemon/bin/dbus/jamid",
+            },
+            "program": "",
+            "args": [
+                "-cdp",
+            ],
+            "cwd": "${workspaceFolder}",
+            "preLaunchTask": "cmake-build",
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+    "C_Cpp.default.includePath": [
+        "${default}",
+        "${workspaceFolder}/**",
+        "/usr/lib/libqt-jami/include/**",
+        "/usr/lib64/qt-jami/include/**",
+    ],
+    "C_Cpp.default.cppStandard": "c++17",
+    "C_Cpp.default.cStandard": "c11",
+    "cmake.configureOnOpen": true,
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "xaver.clang-format",
+    "files.eol": "\n",
+    "cSpell.enabled": false,
+}

.vscode/tasks.json

@@ -0,0 +1,93 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "run-tests",
+            "type": "shell",
+            "command": "ctest",
+            "options": {
+                "cwd": "${workspaceFolder}/build/tests",
+                "env": {
+                    "HOME": "/tmp"
+                }
+            },
+            "args": [
+                "-V",
+                "-R"
+            ],
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "problemMatcher": [],
+            "detail": "Run the tests using CTest."
+        },
+        {
+            "label": "cmake-configure",
+            "type": "shell",
+            "command": "cmake",
+            "args": [
+                "-S", ".",
+                "-B", "build",
+                "-DCMAKE_BUILD_TYPE=Debug",
+                "-DCMAKE_PREFIX_PATH=\"/usr/lib64/qt-jami;/usr/lib/libqt-jami\"",
+            ],
+            "group": "build",
+            "problemMatcher": [],
+            "detail": "Generate the build system files with CMake."
+        },
+        {
+            "label": "cmake-configure-tests",
+            "type": "shell",
+            "command": "cmake",
+            "args": [
+                "-S", ".",
+                "-B", "build",
+                "-DBUILD_TESTING=${input:buildTestingInput}"
+            ],
+            "group": "build",
+            "problemMatcher": [],
+            "detail": "Generate the build system files with CMake."
+        },
+        {
+            "label": "cmake-build",
+            "type": "shell",
+            "command": "cmake",
+            "args": [
+                "--build", "build",
+                "-j$(nproc)",
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "detail": "Compile the project using the generated build system.",
+            "dependsOn": [
+                "cmake-configure"
+            ]
+        },
+        {
+            "label": "cmake-clean",
+            "type": "shell",
+            "command": "rm",
+            "args": [
+                "-rf",
+                "build"
+            ],
+            "group": "build",
+            "problemMatcher": [],
+            "detail": "Clean the build directory."
+        }
+    ],
+    "inputs": [
+        {
+            "id": "buildTestingInput",
+            "type": "pickString",
+            "description": "Do you want to enable testing?",
+            "options": ["True", "False"],
+        }
+    ]
+}

CMakeLists.txt

@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.19)
 
 if(APPLE)
   project(Jami)
@@ -29,13 +29,11 @@ else()
   project(jami)
 endif()
 
+include(${PROJECT_SOURCE_DIR}/extras/build/cmake/extra_tools.cmake)
+
 option(WITH_DAEMON_SUBMODULE "Build with daemon submodule" ON)
 option(JAMICORE_AS_SUBDIR "Build Jami-core as a subdir dependency" OFF)
-option(ENABLE_TESTS "Build with tests" OFF)
 option(WITH_WEBENGINE "Build with WebEngine" ON)
-if(WITH_WEBENGINE)
-  add_definitions(-DWITH_WEBENGINE)
-endif()
 option(ENABLE_LIBWRAP "Enable libwrap (single process mode)" ON)
 if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     OR ENABLE_LIBWRAP
@@ -51,6 +49,10 @@ if(ENABLE_ASAN AND NOT MSVC)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
 endif()
 
+# These values are exposed to QML and are better off being defined as values.
+define_macro_with_value(WITH_WEBENGINE)
+define_macro_with_value(APPSTORE)
+
 # jami-core
 if(NOT WITH_DAEMON_SUBMODULE)
   set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
@@ -75,6 +77,37 @@ if(NOT MSVC)
   set(CMAKE_CXX_FLAGS_DEBUG "-Og -ggdb")
 endif()
 
+include(${PROJECT_SOURCE_DIR}/extras/build/cmake/contrib_tools.cmake)
+set(EXTRA_PATCHES_DIR ${PROJECT_SOURCE_DIR}/extras/patches)
+
+list(APPEND QWINDOWKIT_OPTIONS
+  QWINDOWKIT_BUILD_WIDGETS OFF
+  QWINDOWKIT_INSTALL OFF
+  QWINDOWKIT_BUILD_STATIC ON
+)
+
+if(WIN32)
+  list(APPEND QWINDOWKIT_OPTIONS QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDERS OFF)
+endif()
+
+# qmsetup uses the wrong package dir on some distributions
+# (including Fedora and openSUSE Leap at least)
+check_distro_needs_qmsetup_patch(DISTRO_NEEDS_QMSETUP_PATCH)
+if(DISTRO_NEEDS_QMSETUP_PATCH)
+  list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0001-fix-fedora-fc-build.patch)
+  set(qmsetup_cmake_path ${CMAKE_BINARY_DIR}/_install/lib64/cmake/qmsetup)
+endif()
+
+# qwindowkit (frameless window)
+add_fetch_content(
+  TARGET qwindowkit
+  URL https://github.com/stdware/qwindowkit.git
+  BRANCH 79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef
+  PATCHES ${QWINDOWKIT_PATCHES}
+  OPTIONS ${QWINDOWKIT_OPTIONS}
+)
+list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
+list(APPEND CLIENT_LIBS QWindowKit::Quick)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -97,19 +130,24 @@ set(TESTS_DIR ${PROJECT_SOURCE_DIR}/tests)
 # Here we let find_package(<PackageName>...) try to find Qt 6,
 # If it is found, find_package will succeed, and the CMake variable
 # QT_VERSION_MAJOR will be defined 6.
-set(QT6_MINVER_MINOR 5)
+set(QT6_MINVER_MINOR 6)
 if(QT6_VER AND QT6_PATH)
   find_package(QT NAMES Qt6 REQUIRED
     PATHS ${QT6_PATH} NO_DEFAULT_PATH)
 else()
-  message(STATUS "Looking for Qt 6" ${CMAKE_PREFIX_PATH})
+  message(STATUS "Looking for Qt 6 in ${CMAKE_PREFIX_PATH}")
   find_package(QT NAMES Qt6 REQUIRED)
 endif()
 if (${QT_VERSION_MINOR} GREATER_EQUAL ${QT6_MINVER_MINOR})
-  # Qt version is 6.5 or higher
+  # Enforce a minimum Qt version of 6.6.2 for the Windows build
+  # https://github.com/stdware/qwindowkit/issues/23
+  if(MSVC AND ${QT_VERSION_MINOR} EQUAL 6 AND ${QT_VERSION_PATCH} LESS 2)
+    message(FATAL_ERROR "Qt 6.6.2 or higher is required. Found ${QT_VERSION}")
+  endif()
+  # Qt version is 6.6 or higher
   message(STATUS "Found a suitable Qt version ${QT_VERSION}")
 else()
-  message(FATAL_ERROR "Qt 6.5 or higher is required. Found ${QT_VERSION}")
+  message(FATAL_ERROR "Qt 6.6 or higher is required. Found ${QT_VERSION}")
 endif()
 
 # libjamiclient
@@ -188,6 +226,7 @@ execute_process(
   ${PYTHON_EXEC} ${SCRIPTS_DIR}/gen_qml_qrc.py ${GEN_QRC_ARGS}
   WORKING_DIRECTORY ${APP_SRC_DIR})
 set(QML_RESOURCES_QML ${APP_SRC_DIR}/qml.qrc)
+
 # Image and misc. resources
 # check files in the resources directory and force a reconfigure if it
 # changes
@@ -199,6 +238,11 @@ execute_process(
   WORKING_DIRECTORY ${APP_SRC_DIR})
 set(QML_RESOURCES ${APP_SRC_DIR}/resources.qrc)
 
+# Find modules (QtCreator) under the root source dir.
+list(APPEND QML_DIRS ${APP_SRC_DIR})
+set(QML_IMPORT_PATH ${QML_DIRS}
+  CACHE STRING "Qt Creator extra qml import paths" FORCE)
+
 # library compatibility (boost, libnotify, etc.)
 add_definitions(-DQT_NO_KEYWORDS)
 
@@ -262,6 +306,7 @@ set(COMMON_SOURCES
   ${APP_SRC_DIR}/pluginversionmanager.cpp)
 
 set(COMMON_HEADERS
+  ${APP_SRC_DIR}/global.h
   ${APP_SRC_DIR}/avatarimageprovider.h
   ${APP_SRC_DIR}/networkmanager.h
   ${APP_SRC_DIR}/smartlistmodel.h
@@ -410,10 +455,12 @@ elseif (NOT APPLE)
     ${APP_SRC_DIR}/xrectsel.c
     ${APP_SRC_DIR}/connectivitymonitor.cpp
     ${APP_SRC_DIR}/dbuserrorhandler.cpp
-    ${APP_SRC_DIR}/appversionmanager.cpp)
+    ${APP_SRC_DIR}/appversionmanager.cpp
+    ${APP_SRC_DIR}/screencastportal.cpp)
   list(APPEND COMMON_HEADERS
     ${APP_SRC_DIR}/xrectsel.h
-    ${APP_SRC_DIR}/dbuserrorhandler.h)
+    ${APP_SRC_DIR}/dbuserrorhandler.h
+    ${APP_SRC_DIR}/screencastportal.h)
   list(APPEND QT_MODULES DBus)
 
   find_package(PkgConfig REQUIRED)
@@ -428,6 +475,11 @@ elseif (NOT APPLE)
     add_definitions(${GIO_CFLAGS})
   endif()
 
+  pkg_check_modules(GIOUNIX REQUIRED gio-unix-2.0)
+  if(GIOUNIX_FOUND)
+    add_definitions(${GIOUNIX_CFLAGS})
+  endif()
+
   pkg_check_modules(LIBNM libnm)
   if(LIBNM_FOUND)
     add_definitions(-DUSE_LIBNM)
@@ -539,6 +591,7 @@ include_directories(
 if(ENABLE_LIBWRAP)
   list(APPEND COMMON_HEADERS
     ${LIBCLIENT_SRC_DIR}/qtwrapper/instancemanager_wrap.h)
+  add_definitions(-DENABLE_LIBWRAP=true)
 endif()
 
 # SFPM
@@ -547,6 +600,7 @@ add_subdirectory(3rdparty/SortFilterProxyModel)
 set(SFPM_OBJECTS $<TARGET_OBJECTS:SortFilterProxyModel>)
 
 # md4c
+set(BUILD_MD2HTML_EXECUTABLE OFF CACHE BOOL "Don't build md2html executable" FORCE)
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "Don't build shared md4c library" FORCE)
 add_subdirectory(3rdparty/md4c EXCLUDE_FROM_ALL)
 list(APPEND CLIENT_LINK_DIRS ${MD4C_BINARY_DIR}/src)
@@ -800,7 +854,6 @@ else()
           MACOSX_BUNDLE_COPYRIGHT "${PROJ_COPYRIGHT}")
       if(APPSTORE)
           message(STATUS "app store version")
-          add_definitions(-DAPPSTORE)
           set_target_properties(${PROJECT_NAME} PROPERTIES
                XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/appstore/Jami.entitlements")
       else()
@@ -829,7 +882,7 @@ qt_import_qml_plugins(${PROJECT_NAME})
 qt_finalize_executable(${PROJECT_NAME})
 
 # tests
-if(ENABLE_TESTS)
+if(BUILD_TESTING)
   message("Add Jami tests")
   add_subdirectory(${TESTS_DIR})
 endif()

INSTALL.md

@@ -7,9 +7,9 @@ There are essentially two ways to build `client-qt`:
 
 ## Disclaimer
 
-Because the client-qt is multi-platforms and supporting macOS, we need a recent version of Qt to do rendering with Metal. So, Qt 6.5 is necessary.
+Because the client-qt is multi-platforms and supporting macOS, we need a recent version of Qt to do rendering with Metal. So, Qt 6.6 is necessary.
 This version is generally not packaged on a lot of platforms, and to control available plugins and such, we have our own Qt packaged (available on https://jami.net on the distributions we support).
-So, you will need to get Qt 6.5 first. For this, there is 3 methods:
+So, you will need to get Qt 6.6 first. For this, there is 3 methods:
 
 ### Qt from our repo (recommended)
 
@@ -49,7 +49,7 @@ sudo dnf update && sudo dnf install jami-libqt
 
 ### Qt from your distribution
 
-If Qt 6.5 is available, you can use the packages from your distribution:
+If Qt 6.6 is available, you can use the packages from your distribution:
 
 It should be (For now qt5 only is packaged by distributions, so names can change).
 
@@ -118,7 +118,7 @@ Then, you can build daemon and the client using:
 
 If you use a Qt version that is not system-wide installed, you need to
 specify its path using the `--qt` flag, e.g.
-`./build.py --install --qt=/home/<username>/Qt/6.5.1/gcc_64`.
+`./build.py --install --qt=/home/<username>/Qt/6.6.1/gcc_64`.
 
 Now you will have the daemon in `daemon/bin/dbus/jamid` and the client in
 `build/jami`. You can now run Jami using:
@@ -131,10 +131,15 @@ Notes:
 
 - `--global-install` to install client-qt globally under /usr/local
 - `--prefix` to change the destination of the install.
++ For developers:
+    + `--asan` add address sanitizer on the binary
+    + `--debug` enable debug symbols
+    + `--testing` will build the tests for both the daemon and client
+    + `--no-libwrap` will build the DBUS version.
 
 ## Build only the client
 
-In order to use the Qt Client it is necessary to have the Qt version 6.5 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download).
+In order to use the Qt Client it is necessary to have the Qt version 6.6 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download).
 
 ## Build only this repository
 
@@ -184,7 +189,7 @@ Only 64-bit MSVC build can be compiled.
 
 - Download [Qt (Open Source)](https://www.qt.io/download-open-source?hsCtaTracking=9f6a2170-a938-42df-a8e2-a9f0b1d6cdce%7C6cb0de4f-9bb5-4778-ab02-bfb62735f3e5)
 
-- Using the online installer, install the following Qt 6.5.3 components:
+- Using the online installer, install the following Qt 6.6.1 components:
 
   - Git 2.10.2
   - MSVC 2019 64-bit
@@ -203,11 +208,11 @@ Only 64-bit MSVC build can be compiled.
   | ------------ | ------------ | --------------------------------------------------- | ---------------- |
   | Requirement: | 10.0.18362.0 | V142 (VisualStudio 2019) / V143 (VisualStudio 2022) | matching Toolset |
 
-- Install Qt Vs Tools under extensions, and configure msvc2017*64 path under Qt Options. \_See the Qt notes below.*
+- Install Qt Vs Tools under extensions, and configure msvc2019\_64 path under Qt Options. *See the Qt notes below.*
 
   |                      | Qt Version |
   | -------------------- | ---------- |
-  | Minimum requirement: | 6.5.3      |
+  | Minimum requirement: | 6.6.2      |
 
 - Install [Python3](https://www.python.org/downloads/) for Windows
 
@@ -233,7 +238,7 @@ Only 64-bit MSVC build can be compiled.
 - Using a new **Non-Elevated Command Prompt**
 
 ```bash
-    python build.py --install --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.5.3/msvc2019_64)
+    python build.py --install --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.6.2/msvc2019_64)
 ```
 
 > **SDK** Note:
@@ -276,19 +281,19 @@ Once the build has finished, you should then be able to use the Visual Studio So
 
 ```
     python extras\scripts\build-windows.py --init
-    python extras\scripts\build-windows.py --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.5.3/msvc2019_64)
+    python extras\scripts\build-windows.py --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.6.2/msvc2019_64)
 ```
 
 ## Building On MacOS
 
 **Set up**
 
-- macOS minimum version 10.15
+- macOS minimum version 11.0
 - install python3
 - download xcode
-- install Qt 6.5
+- install Qt 6.6
 
-Qt 6.5 can be installed via brew
+Qt 6.6 can be installed via brew
 
 ```bash
 brew install qt

build.py

@@ -99,7 +99,7 @@ ZYPPER_DEPENDENCIES = [
     # daemon
     'speexdsp-devel', 'speex-devel', 'libdbus-c++-devel', 'jsoncpp-devel', 'yaml-cpp-devel',
     'yasm', 'libuuid-devel', 'libnettle-devel', 'libopus-devel', 'libexpat-devel',
-    'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel', 'libavdevice-devel', 'pcre-devel',
+    'libgnutls-devel', 'msgpack-c-devel', 'msgpack-cxx-devel', 'libavcodec-devel', 'libavdevice-devel', 'pcre-devel',
     'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel', 'libvdpau-devel',
     'libopenssl-devel', 'libavutil-devel',
 ]
@@ -108,8 +108,10 @@ ZYPPER_CLIENT_DEPENDENCIES = [
     # lrc
     'qt6-core-devel', 'qt6-dbus-devel', 'qt6-linguist-devel',
     # client-qt
-    'qt6-svg-devel', 'qt6-multimedia-devel', 'qt6-declarative-devel',
-    'qt6-quickcontrols2-devel',
+    'qt6-concurrent-devel', 'qt6-qt5compat-devel', 'qt6-qt5compat-imports',
+    'qt6-svg-devel', 'qt6-multimedia-devel', 'qt6-multimedia-imports',
+    'qt6-declarative-devel', 'qt6-qmlcompiler-private-devel',
+    'qt6-quickcontrols2-devel', 'qt6-shadertools-devel',
     'qrencode-devel', 'NetworkManager-devel'
 ]
 
@@ -244,8 +246,8 @@ def run_dependencies(args):
 
     elif args.distribution in DNF_BASED_DISTROS:
         if args.assume_yes:
-            for i, _ in enumerate(DNF_INSTALL_SCRIPT):
-                DNF_INSTALL_SCRIPT[i] += ASSUME_YES_FLAG
+            for i, _ in enumerate(RPM_INSTALL_SCRIPT):
+                RPM_INSTALL_SCRIPT[i] += ASSUME_YES_FLAG
         execute_script(
             RPM_INSTALL_SCRIPT,
             {"packages": ' '.join(map(shlex.quote, DNF_DEPENDENCIES))})
@@ -387,6 +389,8 @@ def run_install(args):
         install_args.append('-u')
     if args.debug:
         install_args.append('-d')
+    if args.testing:
+        install_args.append('-t')
     if args.asan:
         install_args.append('-A')
     if args.no_libwrap:
@@ -395,6 +399,8 @@ def run_install(args):
         install_args.append('-w')
     if args.arch:
         install_args += ('-a', args.arch)
+    if args.extra_cmake_flags:
+        install_args += ('-D', args.extra_cmake_flags)
 
     if args.distribution == OSX_DISTRIBUTION_NAME:
         # The `universal_newlines` parameter has been renamed to `text` in
@@ -723,6 +729,9 @@ def parse_args():
                     default=True, action='store_false')
     ap.add_argument('--qt', type=str,
                     help='Use the Qt path supplied')
+    ap.add_argument('--testing', dest='testing',
+                    default=False, action='store_true',
+                    help='Enable testing for both client and daemon')
     ap.add_argument('--no-libwrap', dest='no_libwrap',
                     default=False, action='store_true',
                     help='Disable libwrap. Also set --disable-shared option to daemon configure')
@@ -738,6 +747,9 @@ def parse_args():
     ap.add_argument('--pywinmake', dest='pywinmake',
                     default=False, action='store_true',
                     help='Build Jami for Windows using pywinmake')
+    # Allow supplying extra congifure flags to the client cmake.
+    ap.add_argument('--extra-cmake-flags', type=str,
+                    help='Extra flags to pass to the client cmake')
 
     dist = choose_distribution()
 

extras/build/cmake/contrib_tools.cmake

@@ -0,0 +1,92 @@
+# Copyright (C) 2024 Savoir-faire Linux Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+
+include(FetchContent)
+include(CMakeParseArguments)
+
+# Helper function to check if we're on a distribution that requires us
+# to apply a patch in order for qmsetup to use the right package directory
+function(check_distro_needs_qmsetup_patch DISTRO_NEEDS_QMSETUP_PATCH)
+  set(${DISTRO_NEEDS_QMSETUP_PATCH} FALSE PARENT_SCOPE)
+  # Check for the existence of /etc/os-release
+  if(EXISTS "/etc/os-release")
+    # Read the content of the file
+    file(READ "/etc/os-release" OS_RELEASE_CONTENT)
+      # Check if the distribution is Fedora or Red Hat-based
+      string(REGEX MATCH "ID=fedora|ID_LIKE=\"rhel fedora\"|ID_LIKE=\"rhel centos fedora\"" RED_HAT_BASED "${OS_RELEASE_CONTENT}")
+      # Check if the distribution is openSUSE Leap
+      string(REGEX MATCH "ID=\"opensuse-leap\"" OPENSUSE_LEAP "${OS_RELEASE_CONTENT}")
+      if(RED_HAT_BASED)
+        set(${DISTRO_NEEDS_QMSETUP_PATCH} TRUE PARENT_SCOPE)
+        message(STATUS "Running on a Red Hat-based distribution (Fedora, RHEL, CentOS, etc.)")
+      elseif(OPENSUSE_LEAP)
+        set(${DISTRO_NEEDS_QMSETUP_PATCH} TRUE PARENT_SCOPE)
+        message(STATUS "Running on openSUSE Leap")
+      else()
+        message(STATUS "Distribution is not openSUSE Leap or Red Hat-based")
+      endif()
+  else()
+    message(STATUS "Cannot determine the distribution type: /etc/os-release not found")
+  endif()
+endfunction()
+
+# Helper function to add external content with patches and options.
+# Parameters:
+#   TARGET: Name of the target to create
+#   URL: URL of the git repository
+#   BRANCH: Branch to checkout
+#   PATCHES: List of patch files to apply
+#   OPTIONS: List of options to set prior to calling FetchContent_MakeAvailable
+function(add_fetch_content)
+  # Parse function arguments
+  set(oneValueArgs TARGET URL BRANCH)
+  set(multiValueArgs PATCHES OPTIONS)
+  cmake_parse_arguments(PARSE_ARGV 0 AFCWP "" "${oneValueArgs}" "${multiValueArgs}")
+
+  # Create a string for the patch command
+  set(patch_cmd "")
+  # If patches is not empty, start the command with "git apply"
+  if(NOT "${AFCWP_PATCHES}" STREQUAL "")
+    set(patch_cmd git apply)
+  endif()
+  foreach(patch_file IN LISTS AFCWP_PATCHES)
+    list(APPEND patch_cmd "${patch_file}")
+  endforeach()
+
+  # Declare the external content
+  FetchContent_Declare(
+    ${AFCWP_TARGET}
+    GIT_REPOSITORY ${AFCWP_URL}
+    GIT_TAG ${AFCWP_BRANCH}
+    PATCH_COMMAND ${patch_cmd}
+    UPDATE_DISCONNECTED 1
+  )
+
+  # Apply options
+  list(LENGTH AFCWP_OPTIONS options_length)
+  if(NOT ${options_length} EQUAL 0)
+    math(EXPR max_idx "${options_length} - 1")
+    foreach(idx RANGE 0 ${max_idx} 2)
+      list(GET AFCWP_OPTIONS ${idx} key)
+      math(EXPR value_idx "${idx} + 1")
+      list(GET AFCWP_OPTIONS ${value_idx} value)
+      set(${key} ${value} CACHE STRING "${key}" FORCE)
+    endforeach()
+  endif()
+
+  # Make the content available
+  FetchContent_MakeAvailable(${AFCWP_TARGET})
+endfunction()

extras/build/cmake/extra_tools.cmake

@@ -0,0 +1,38 @@
+# Copyright (C) 2024 Savoir-faire Linux Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+
+# Function to define a macro with a specific value or default to 0 if not already set.
+# This is useful to if within the code we don't want to use #ifdef but rather use the
+# value of the macro.
+function(define_macro_with_value MACRO_NAME)
+  if(DEFINED ${MACRO_NAME})
+    # Convert ON/OFF to 1/0
+    if(${${MACRO_NAME}} STREQUAL "ON")
+      set(MACRO_VALUE "1")
+    elseif(${${MACRO_NAME}} STREQUAL "OFF")
+      set(MACRO_VALUE "0")
+    # If the macro is defined and its value is neither "ON" nor "OFF",
+    # set MACRO_VALUE to the macro's current value
+    else()
+      set(MACRO_VALUE "${${MACRO_NAME}}")
+    endif()
+  else()
+    set(MACRO_VALUE "0")
+  endif()
+
+  # Add the macro definition to the compiler command line
+  add_definitions("-D${MACRO_NAME}=${MACRO_VALUE}")
+endfunction()

extras/build/docker/Dockerfile.client-qt-gnulinux

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV QT_QUICK_BACKEND software
@@ -10,7 +10,7 @@ RUN apt-get update && \
 
 RUN apt install gnupg dirmngr ca-certificates curl --no-install-recommends
 RUN curl -s https://dl.jami.net/public-key.gpg | tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
-RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/internal/ubuntu_20.04/ jami main' > /etc/apt/sources.list.d/jami.list"
+RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/internal/ubuntu_22.04/ jami main' > /etc/apt/sources.list.d/jami.list"
 RUN apt-get update && apt-get install libqt-jami -y
 
 RUN apt-get install -y -o Acquire::Retries=10 \
@@ -51,6 +51,7 @@ RUN apt-get install -y -o Acquire::Retries=10 \
         libswscale-dev \
         libavdevice-dev \
         libopus-dev \
+        libpipewire-0.3-dev \
         libudev-dev \
         libgsm1-dev \
         libjsoncpp-dev \
@@ -66,4 +67,9 @@ RUN apt-get install -y -o Acquire::Retries=10 \
         libssl-dev
 RUN apt-get install -y pandoc \
         googletest \
-        libgtest-dev
+        libgtest-dev \
+        wget
+
+# Install a recent version of CMake
+ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
+RUN /opt/install-cmake.sh

extras/ci/client-qt-gnulinux/Jenkinsfile

@@ -113,7 +113,7 @@ pipeline {
                                     cd ${dockerTopDir}
                                     ./build.py --install --qt /usr/lib/libqt-jami/
                                     cd build
-                                    cmake .. -DENABLE_TESTS=True
+                                    cmake .. -DBUILD_TESTING=True
                                     make -j${cpuCount}
                                 """)
                                 // Run tests

extras/packaging/gnu-linux/Makefile

@@ -46,10 +46,10 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc
 
 # Qt versions
 QT_MAJOR := 6
-QT_MINOR := 5
-QT_PATCH := 3
-QT_TARBALL_CHECKSUM := 7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb
-DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-1
+QT_MINOR := 6
+QT_PATCH := 1
+QT_TARBALL_CHECKSUM := dd3668f65645fe270bc615d748bd4dc048bd17b9dc297025106e6ecc419ab95d
+DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-0
 DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
 QT_JAMI_PREFIX := /usr/lib/libqt-jami
 
@@ -168,9 +168,11 @@ DISTRIBUTIONS := \
 	ubuntu_22.04 \
 	ubuntu_23.04 \
 	ubuntu_23.10 \
+	ubuntu_24.04 \
 	fedora_37 \
 	fedora_38 \
 	fedora_39 \
+	fedora_40 \
 	alma_9 \
 	opensuse-leap_15.4 \
 	opensuse-leap_15.5 \

extras/packaging/gnu-linux/docker/Dockerfile_alma_9

@@ -100,6 +100,7 @@ RUN dnf install -y \
         cmake \
         fmt-devel \
         python3-html5lib \
-        cups-devel
+        cups-devel \
+        pipewire-devel
 ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
 CMD ["/opt/build-package-rpm.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_debian_11

@@ -8,7 +8,12 @@ RUN apt-get update && \
         devscripts \
         equivs \
         python-is-python3 \
-        wget
+        wget \
+        curl
+
+# nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
+RUN apt install nodejs -y
 
 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
 
@@ -18,9 +23,15 @@ RUN /opt/prebuild-package-debian.sh qt-deps
 COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
 RUN /opt/prebuild-package-debian.sh jami-deps
 
-# Install CMake 3.20 for Qt 6
+# Install CMake 3.21 for Qt 6
 ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
 RUN /opt/install-cmake.sh
 
 ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+# Setting this variable so that FFmpeg gets built without pipewiregrab
+# (see daemon/contrib/bootstrap and daemon/contrib/src/ffmpeg/rules.mak)
+# We rely on PipeWire for screen sharing on Wayland, but the version available on Debian 11 is too old.
+ENV DISABLE_PIPEWIRE=true
+
 CMD ["/opt/build-package-debian.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_debian_testing

@@ -11,6 +11,14 @@ RUN apt-get update --allow-releaseinfo-change && \
         wget \
         nasm
 
+# As of January 2024, the default compiler on Debian testing is GCC 13.2.0, which
+# can't build one of Qt 6.6.1's dependencies, see:
+# https://github.com/qt/qtquick3d-assimp/commit/253f8bfa621a9fa6cd2c36291cdaa8c60c99322c
+# The linked commit above fixes the problem and is included in more recent versions of Qt.
+# For now, we use GCC 12 as a temporary workaround:
+ADD extras/packaging/gnu-linux/scripts/install-gcc-debian.sh /opt/install-gcc-debian.sh
+RUN /opt/install-gcc-debian.sh 12
+
 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
 
 COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
@@ -19,7 +27,7 @@ RUN /opt/prebuild-package-debian.sh qt-deps
 COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
 RUN /opt/prebuild-package-debian.sh jami-deps
 
-# Install CMake 3.19 for Qt 6
+# Install CMake 3.21 for Qt 6
 ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
 RUN /opt/install-cmake.sh
 

extras/packaging/gnu-linux/docker/Dockerfile_debian_unstable

@@ -11,6 +11,14 @@ RUN apt-get update && \
         libdbus-1-dev \
         wget
 
+# As of January 2024, the default compiler on Debian unstable is GCC 13.2.0, which
+# can't build one of Qt 6.6.1's dependencies, see:
+# https://github.com/qt/qtquick3d-assimp/commit/253f8bfa621a9fa6cd2c36291cdaa8c60c99322c
+# The linked commit above fixes the problem and is included in more recent versions of Qt.
+# For now, we use GCC 12 as a temporary workaround:
+ADD extras/packaging/gnu-linux/scripts/install-gcc-debian.sh /opt/install-gcc-debian.sh
+RUN /opt/install-gcc-debian.sh 12
+
 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
 
 COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
@@ -19,7 +27,7 @@ RUN /opt/prebuild-package-debian.sh qt-deps
 COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
 RUN /opt/prebuild-package-debian.sh jami-deps
 
-# Install CMake 3.19 for Qt 6
+# Install CMake 3.21 for Qt 6
 ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
 RUN /opt/install-cmake.sh
 

extras/packaging/gnu-linux/docker/Dockerfile_fedora_37

@@ -98,6 +98,7 @@ RUN dnf install -y \
         clang \
         cmake \
         fmt-devel \
+        pipewire-devel \
         cups-devel #Chromium for Qt
 
 ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh

extras/packaging/gnu-linux/docker/Dockerfile_fedora_38

@@ -98,7 +98,8 @@ RUN dnf install -y \
         cmake \
         fmt-devel \
         python3-html5lib \
-        cups-devel
+        cups-devel \
+        pipewire-devel
 
 ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
 

extras/packaging/gnu-linux/docker/Dockerfile_fedora_39

@@ -97,7 +97,8 @@ RUN dnf install -y \
         cmake \
         fmt-devel \
         python3.10 \
-        cups-devel
+        cups-devel \
+        pipewire-devel
 
 ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
 

extras/packaging/gnu-linux/docker/Dockerfile_fedora_40

@@ -0,0 +1,105 @@
+FROM fedora:40
+
+RUN dnf clean all
+RUN dnf update -y
+
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+
+RUN dnf groupinstall -y "X Software Development"
+
+RUN dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        nasm \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        mesa-libgbm-devel \
+        mesa-dri-drivers \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        uuid-c++-devel \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        jsoncpp-devel \
+        libnatpmp-devel \
+        webkitgtk4-devel \
+        cryptopp-devel \
+        libva-devel \
+        libvdpau-devel \
+        msgpack-devel \
+        NetworkManager-libnm-devel \
+        openssl-devel \
+        clutter-devel \
+        clutter-gtk-devel \
+        libappindicator-gtk3-devel \
+        libnotify-devel \
+        libupnp-devel \
+        qrencode-devel \
+        libargon2-devel \
+        libsndfile-devel \
+        libdrm \
+        gperf \
+        bison \
+        clang \
+        clang-devel \
+        llvm-devel \
+        nodejs \
+        flex \
+        gstreamer1 gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        gstreamer1-plugins-good \
+        gstreamer1-plugins-bad-free-devel \
+        nss-devel \
+        libxcb* \
+        libxkb* \
+        libX11-devel \
+        vulkan-devel \
+        libXrender-devel \
+        xcb-util-* \
+        xz \
+        xkeyboard-config \
+        libnotify \
+        wget \
+        libstdc++-static \
+        sqlite-devel \
+        perl-generators \
+        perl-English \
+        libxshmfence-devel \
+        ninja-build \
+        clang \
+        cmake \
+        fmt-devel \
+        python3.10 \
+        cups-devel \
+        pipewire-devel
+
+ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
+
+CMD ["/opt/build-package-rpm.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4

@@ -59,6 +59,7 @@ RUN zypper --non-interactive install -y \
         ffmpeg-4-libavutil-devel \
         gtk3-devel\
         qrencode-devel \
+        python310 \
         python3-python-dateutil \
         python3-html5lib \
         libsndfile-devel \
@@ -67,7 +68,7 @@ RUN zypper --non-interactive install -y \
         bison \
         flex \
         ffmpeg ffmpeg-devel \
-        nodejs12 \
+        nodejs18 \
         mozilla-nss-devel \
         python-xml \
         python3-six \
@@ -98,7 +99,12 @@ RUN zypper --non-interactive install -y \
         gstreamer-plugins-bad-devel \
         gstreamer-plugins-base-devel \
         cmake \
-        wget
+        wget \
+        pipewire-devel
+
+# openSUSE Leap 15.4 comes with Python 3.6 by default,
+# but we need at least 3.7 to compile Qt 6.6.1
+RUN rm /usr/bin/python3 && ln -s /usr/bin/python3.10 /usr/bin/python3
 
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 50
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 50
@@ -107,4 +113,10 @@ ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-r
 
 ENV CC=gcc
 ENV CXX=g++
+
+# Setting this variable so that FFmpeg gets built without pipewiregrab
+# (see daemon/contrib/bootstrap and daemon/contrib/src/ffmpeg/rules.mak)
+# We rely on PipeWire for screen sharing on Wayland, but the version available on openSUSE Leap 15.4 is too old.
+ENV DISABLE_PIPEWIRE=true
+
 CMD ["/opt/build-package-rpm.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.5

@@ -60,6 +60,7 @@ RUN zypper --non-interactive install -y \
         ffmpeg-4-libavutil-devel \
         gtk3-devel\
         qrencode-devel \
+        python310 \
         python3-python-dateutil \
         python3-html5lib \
         libsndfile-devel \
@@ -99,7 +100,12 @@ RUN zypper --non-interactive install -y \
         gstreamer-plugins-bad-devel \
         gstreamer-plugins-base-devel \
         cmake \
-        wget
+        wget \
+        pipewire-devel
+
+# openSUSE Leap 15.5 comes with Python 3.6 by default,
+# but we need at least 3.7 to compile Qt 6.6.1
+RUN rm /usr/bin/python3 && ln -s /usr/bin/python3.10 /usr/bin/python3
 
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 50
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 50

extras/packaging/gnu-linux/docker/Dockerfile_snap

@@ -69,7 +69,11 @@ COPY --from=builder /snap/snapcraft /snap/snapcraft
 COPY --from=builder /snap/bin/snapcraft /snap/bin/snapcraft
 
 # Generate locale and install dependencies.
-RUN apt-get update && apt-get dist-upgrade --yes && apt-get install --yes snapd sudo apt-transport-https locales && locale-gen en_US.UTF-8
+RUN apt-get update && apt-get dist-upgrade --yes && apt-get install --yes snapd sudo apt-transport-https locales wget && locale-gen en_US.UTF-8
+
+# Install CMake 3.21 for Qt 6
+ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
+RUN /opt/install-cmake.sh
 
 # Set the proper environment.
 ENV LANG="en_US.UTF-8"

extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04

@@ -11,8 +11,13 @@ RUN apt-get update && \
         wget \
         curl
 
+# Installing GCC 10 because GCC 9 (the default on Ubuntu 20.04) doesn't support
+# the --std=gnu++20 option, which is used by one of Qt 6.6.1's dependencies
+ADD extras/packaging/gnu-linux/scripts/install-gcc-debian.sh /opt/install-gcc-debian.sh
+RUN /opt/install-gcc-debian.sh 10
+
 # nodejs
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
 RUN apt install nodejs -y
 
 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
@@ -23,9 +28,15 @@ RUN /opt/prebuild-package-debian.sh qt-deps
 COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
 RUN /opt/prebuild-package-debian.sh jami-deps
 
-# Install CMake 3.19 for Qt 6
+# Install CMake 3.21 for Qt 6
 ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
 RUN /opt/install-cmake.sh
 
 ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+# Setting this variable so that FFmpeg gets built without pipewiregrab
+# (see daemon/contrib/bootstrap and daemon/contrib/src/ffmpeg/rules.mak)
+# We rely on PipeWire for screen sharing on Wayland, but the version available on Ubuntu 20.04 is too old.
+ENV DISABLE_PIPEWIRE=true
+
 CMD ["/opt/build-package-debian.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_22.04

@@ -8,7 +8,12 @@ RUN apt-get update && \
         devscripts \
         equivs \
         python-is-python3 \
-        wget
+        wget \
+        curl
+
+# nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
+RUN apt install nodejs -y
 
 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
 

extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.10

@@ -10,6 +10,14 @@ RUN apt-get update && \
         python-is-python3 \
         wget
 
+# The default compiler on Ubuntu 23.10, GCC 13.2.0, can't build one of Qt 6.6.1's
+# dependencies, see:
+# https://github.com/qt/qtquick3d-assimp/commit/253f8bfa621a9fa6cd2c36291cdaa8c60c99322c
+# The linked commit above fixes the problem and is included in more recent versions of Qt.
+# For now, we use GCC 12 as a temporary workaround:
+ADD extras/packaging/gnu-linux/scripts/install-gcc-debian.sh /opt/install-gcc-debian.sh
+RUN /opt/install-gcc-debian.sh 12
+
 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
 
 COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control

extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_24.04

@@ -0,0 +1,25 @@
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retries=10 \
+        devscripts \
+        equivs \
+        python-is-python3 \
+        wget
+
+ADD extras/packaging/gnu-linux/scripts/install-gcc-debian.sh /opt/install-gcc-debian.sh
+RUN /opt/install-gcc-debian.sh 13
+
+ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
+
+COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
+RUN /opt/prebuild-package-debian.sh qt-deps
+
+COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
+RUN /opt/prebuild-package-debian.sh jami-deps
+
+ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
+CMD ["/opt/build-package-debian.sh"]

extras/packaging/gnu-linux/rules/debian-qt/control

@@ -92,6 +92,7 @@ Build-Depends: debhelper (>= 9),
                libgl1-mesa-dri,
 # pkg-kde-tools (>= 0.15.17~),
                python3:any,
+               python3-bs4,
                python3-html5lib,
 # qtbase5-private-dev (>= 5.15.2+dfsg~),
                xauth <!nocheck>,
@@ -314,7 +315,7 @@ Build-Depends: debhelper (>= 9),
                libxtst-dev,
                mesa-common-dev,
                ninja-build,
-               nodejs (>= 10.19),
+               nodejs (>= 14.21),
 # pkg-config,
 # pkg-kde-tools,
                protobuf-compiler,

extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-mathops.patch

@@ -1,81 +0,0 @@
-From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
-From: Rémi Denis-Courmont <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] Fix ffmpeg assembly with newer binutil
-
-avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
-
-Deals with: "Error: operand type mismatch for `shr'"
-
-Fixes: QTBUG-116649
-Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-index 6298f5e..ca7e2df 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
-     int rt, dummy;
-+    if (__builtin_constant_p(shift))
-     __asm__ (
-         "imull %3               \n\t"
-         "shrdl %4, %%edx, %%eax \n\t"
-         :"=a"(rt), "=d"(dummy)
--        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-     );
-+    else
-+        __asm__ (
-+            "imull %3               \n\t"
-+            "shrdl %4, %%edx, %%eax \n\t"
-+            :"=a"(rt), "=d"(dummy)
-+            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+        );
-     return rt;
- }
-
-@@ -113,19 +121,31 @@
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("sarl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("sarl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("shrl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("shrl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }

extras/packaging/gnu-linux/rules/debian-qt/patches/0001-replace_imp_by_importlib.patch

@@ -0,0 +1,314 @@
+From deeacfdb5a6d1d300d4ba991df76aa12e5dbaa42 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
+ <sebastien.blin@savoirfairelinux.com>
+Date: Tue, 16 Apr 2024 09:54:32 -0400
+Subject: [PATCH] fix imp->importlib
+
+---
+ .../mojo/public/tools/mojom/mojom/fileutil.py    |  1 -
+ .../tools/mojom/mojom/fileutil_unittest.py       |  5 +----
+ .../mojom/mojom/generate/generator_unittest.py   |  7 ++-----
+ .../mojom/mojom/generate/translate_unittest.py   |  4 ----
+ .../tools/mojom/mojom/parse/ast_unittest.py      |  6 ------
+ .../mojom/parse/conditional_features_unittest.py |  8 ++------
+ .../mojo/public/tools/mojom/mojom/parse/lexer.py |  1 -
+ .../tools/mojom/mojom/parse/lexer_unittest.py    |  7 ++-----
+ .../tools/mojom/mojom/parse/parser_unittest.py   |  5 -----
+ .../3rdparty/chromium/third_party/six/src/six.py | 16 ++++++++++++++++
+ 10 files changed, 23 insertions(+), 37 deletions(-)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+index 29daec367c..124f12c134 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+@@ -3,7 +3,6 @@
+ # found in the LICENSE file.
+ 
+ import errno
+-import imp
+ import os.path
+ import sys
+ 
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+index 48eaf4eca9..c93d22898d 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+@@ -2,19 +2,16 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
+ import os.path
+ import shutil
+-import sys
+ import tempfile
+ import unittest
+ 
+ from mojom import fileutil
+ 
+-
+ class FileUtilTest(unittest.TestCase):
+   def testEnsureDirectoryExists(self):
+-    """Test that EnsureDirectoryExists fuctions correctly."""
++    """Test that EnsureDirectoryExists functions correctly."""
+ 
+     temp_dir = tempfile.mkdtemp()
+     try:
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+index 76cda3981f..7143e07c4d 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+@@ -2,12 +2,11 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
++import importlib.util
+ import os.path
+ import sys
+ import unittest
+ 
+-
+ def _GetDirAbove(dirname):
+   """Returns the directory "above" this file containing |dirname| (which must
+   also be "above" this file)."""
+@@ -20,12 +19,11 @@ def _GetDirAbove(dirname):
+ 
+ 
+ try:
+-  imp.find_module("mojom")
++  importlib.util.find_spec("mojom")
+ except ImportError:
+   sys.path.append(os.path.join(_GetDirAbove("pylib"), "pylib"))
+ from mojom.generate import generator
+ 
+-
+ class StringManipulationTest(unittest.TestCase):
+   """generator contains some string utilities, this tests only those."""
+ 
+@@ -69,6 +67,5 @@ class StringManipulationTest(unittest.TestCase):
+     self.assertEquals("SNAKE_D3D11_CASE",
+                       generator.ToUpperSnakeCase("snakeD3d11Case"))
+ 
+-
+ if __name__ == "__main__":
+   unittest.main()
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+index 4259374513..558e71e119 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+@@ -2,16 +2,12 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
+-import os.path
+-import sys
+ import unittest
+ 
+ from mojom.generate import module as mojom
+ from mojom.generate import translate
+ from mojom.parse import ast
+ 
+-
+ class TranslateTest(unittest.TestCase):
+   """Tests |parser.Parse()|."""
+ 
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+index c36376712e..b289f7b11f 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+@@ -2,14 +2,10 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
+-import os.path
+-import sys
+ import unittest
+ 
+ from mojom.parse import ast
+ 
+-
+ class _TestNode(ast.NodeBase):
+   """Node type for tests."""
+ 
+@@ -20,13 +16,11 @@ class _TestNode(ast.NodeBase):
+   def __eq__(self, other):
+     return super().__eq__(other) and self.value == other.value
+ 
+-
+ class _TestNodeList(ast.NodeListBase):
+   """Node list type for tests."""
+ 
+   _list_item_type = _TestNode
+ 
+-
+ class ASTTest(unittest.TestCase):
+   """Tests various AST classes."""
+ 
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+index 5fc582025e..2fa5d2be6a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+@@ -2,12 +2,11 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
++import importlib.util
+ import os
+ import sys
+ import unittest
+ 
+-
+ def _GetDirAbove(dirname):
+   """Returns the directory "above" this file containing |dirname| (which must
+   also be "above" this file)."""
+@@ -18,9 +17,8 @@ def _GetDirAbove(dirname):
+     if tail == dirname:
+       return path
+ 
+-
+ try:
+-  imp.find_module('mojom')
++  importlib.util.find_spec("mojom")
+ except ImportError:
+   sys.path.append(os.path.join(_GetDirAbove('pylib'), 'pylib'))
+ import mojom.parse.ast as ast
+@@ -29,7 +27,6 @@ import mojom.parse.parser as parser
+ 
+ ENABLED_FEATURES = frozenset({'red', 'green', 'blue'})
+ 
+-
+ class ConditionalFeaturesTest(unittest.TestCase):
+   """Tests |mojom.parse.conditional_features|."""
+ 
+@@ -356,6 +353,5 @@ class ConditionalFeaturesTest(unittest.TestCase):
+                       conditional_features.RemoveDisabledDefinitions,
+                       definition, ENABLED_FEATURES)
+ 
+-
+ if __name__ == '__main__':
+   unittest.main()
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+index 73ca15df94..1083a1af7b 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+@@ -2,7 +2,6 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
+ import os.path
+ import sys
+ 
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+index ce376da66e..bc9f835431 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+@@ -2,12 +2,11 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
++import importlib.util
+ import os.path
+ import sys
+ import unittest
+ 
+-
+ def _GetDirAbove(dirname):
+   """Returns the directory "above" this file containing |dirname| (which must
+   also be "above" this file)."""
+@@ -18,17 +17,15 @@ def _GetDirAbove(dirname):
+     if tail == dirname:
+       return path
+ 
+-
+ sys.path.insert(1, os.path.join(_GetDirAbove("mojo"), "third_party"))
+ from ply import lex
+ 
+ try:
+-  imp.find_module("mojom")
++  importlib.util.find_spec("mojom")
+ except ImportError:
+   sys.path.append(os.path.join(_GetDirAbove("pylib"), "pylib"))
+ import mojom.parse.lexer
+ 
+-
+ # This (monkey-patching LexToken to make comparison value-based) is evil, but
+ # we'll do it anyway. (I'm pretty sure ply's lexer never cares about comparing
+ # for object identity.)
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+index 0513343ec7..0a26307b1a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+@@ -2,16 +2,12 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-import imp
+-import os.path
+-import sys
+ import unittest
+ 
+ from mojom.parse import ast
+ from mojom.parse import lexer
+ from mojom.parse import parser
+ 
+-
+ class ParserTest(unittest.TestCase):
+   """Tests |parser.Parse()|."""
+ 
+@@ -1375,6 +1371,5 @@ class ParserTest(unittest.TestCase):
+         r" *associated\? MyInterface& a;$"):
+       parser.Parse(source3, "my_file.mojom")
+ 
+-
+ if __name__ == "__main__":
+   unittest.main()
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/six/src/six.py b/qtwebengine/src/3rdparty/chromium/third_party/six/src/six.py
+index 5fe9f8e141..96b06f8ce7 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/six/src/six.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/six/src/six.py
+@@ -71,6 +71,11 @@ else:
+             MAXSIZE = int((1 << 63) - 1)
+         del X
+ 
++if PY34:
++    from importlib.util import spec_from_loader
++else:
++    spec_from_loader = None
++
+ 
+ def _add_doc(func, doc):
+     """Add documentation to a function."""
+@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
+             return self
+         return None
+ 
++    def find_spec(self, fullname, path, target=None):
++        if fullname in self.known_modules:
++            return spec_from_loader(fullname, self)
++        return None
++
+     def __get_module(self, fullname):
+         try:
+             return self.known_modules[fullname]
+@@ -223,6 +233,12 @@ class _SixMetaPathImporter(object):
+         return None
+     get_source = get_code  # same as get_code
+ 
++    def create_module(self, spec):
++        return self.load_module(spec.name)
++
++    def exec_module(self, module):
++        pass
++
+ _importer = _SixMetaPathImporter(__name__)
+ 
+ 
+-- 
+2.43.0
+

extras/packaging/gnu-linux/rules/debian-qt/patches/0002-fix-binary-tokenizer.patch

@@ -2,7 +2,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-index 3488120..120e47a 100644
+index 3488120543..120e47a76f 100644
 --- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
 +++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
 @@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)

extras/packaging/gnu-linux/rules/debian-qt/patches/0003-fix-mathops.patch

@@ -1,81 +0,0 @@
-From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
-From: Rémi Denis-Courmont <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] Fix ffmpeg assembly with newer binutil
-
-avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
-
-Deals with: "Error: operand type mismatch for `shr'"
-
-Fixes: QTBUG-116649
-Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-index 6298f5e..ca7e2df 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
-     int rt, dummy;
-+    if (__builtin_constant_p(shift))
-     __asm__ (
-         "imull %3               \n\t"
-         "shrdl %4, %%edx, %%eax \n\t"
-         :"=a"(rt), "=d"(dummy)
--        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-     );
-+    else
-+        __asm__ (
-+            "imull %3               \n\t"
-+            "shrdl %4, %%edx, %%eax \n\t"
-+            :"=a"(rt), "=d"(dummy)
-+            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+        );
-     return rt;
- }
-
-@@ -113,19 +121,31 @@
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("sarl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("sarl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("shrl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("shrl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }

extras/packaging/gnu-linux/rules/debian-qt/patches/0004-fix-binary-tokenizer.patch

@@ -1,16 +0,0 @@
- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-index 3488120..120e47a 100644
---- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-+++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
-     }
-     catch (const DeadlyImportError& e)
-     {
--        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
-+        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
-             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
-         }
-         throw;

extras/packaging/gnu-linux/rules/debian-qt/patches/0005-importlib.patch

@@ -1,433 +0,0 @@
- qtbase/src/corelib/debug_script.py                                                                            | 2 +-
- qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
- qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
- qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
- qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
- .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
- .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
- .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
- .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
- qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
- qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
- 31 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
-index f6207c6104..663c8e0ac1 100644
---- a/qtbase/src/corelib/debug_script.py
-+++ b/qtbase/src/corelib/debug_script.py
-@@ -3,7 +3,7 @@
-
- import os
- import sys
--import imp
-+import importlib
-
- from distutils.version import LooseVersion
-
-diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
-index 681039d34b..a1fe56fa05 100644
---- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
-+++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
-@@ -16,7 +16,7 @@ import subprocess
- import sys
- import tempfile
- import time
--import imp
-+import importlib
-
- # from TestCasePackagerConfig import *
-
-diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
-index 92d4e6139b..7a18e12ced 100644
---- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
-+++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
-@@ -7,7 +7,7 @@ import unittest
-
- import os
- import yaml
--import imp
-+import importlib
-
- # add parent dir to search path
- import sys
-diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
-index c7412927c8..ad2caff318 100755
---- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
-@@ -5,7 +5,7 @@
-
- import os
- import sys
--import imp
-+import importlib
- import tempfile
- import unittest
- import PRESUBMIT
-diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-index 5daee773ba..2d6b124162 100755
---- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-+++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-@@ -9,7 +9,7 @@
- """
- from __future__ import print_function
- import abc
--import imp
-+import importlib
- import optparse
- import os
- import re
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
-index bf626f5479..3fae129aaa 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
-
- import errno
--import imp
-+import importlib
- import os.path
- import sys
-
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
-index ff5753a291..04fc34f742 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import shutil
- import sys
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
-index 32c884a8c0..e761faa54c 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
-index 95a916db08..4331e2fbfa 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
-index 62798631db..28e9dbf705 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
-index cba249b0f3..5a4051827a 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
-index 4a2fefc712..11a9879cb7 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
-
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
-index cc17ae0253..bcc944f06b 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
-index bd72830e54..f2fdc9ae28 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
-index 1feb303a48..8428de61bb 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
-@@ -6,7 +6,7 @@
- angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
- """
-
--import imp
-+import importlib
- import os
- import unittest
- from angle_presubmit_utils import *
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
-index ed4f38c67b..cac734cefa 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
-@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
-
--import imp
-+import importlib
- import inspect
- import os
- import re
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
-index 0244c9787e..f535afe99c 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
-@@ -32,7 +32,7 @@ if PY3:
-     memoryview_type = memoryview
-     struct_bool_decl = "?"
- else:
--    import imp
-+    import importlib
-     string_types = (unicode,)
-     if PY26 or PY27:
-         binary_types = (str,bytearray)
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
-index 8430390eea..29212205bc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
-@@ -732,7 +732,7 @@ class Environment(object):
-                 )
-                 py_compile = False
-             else:
--                import imp
-+                import importlib
-                 import marshal
-
-                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
-index 06bb8d99f5..05089dc982 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
-@@ -115,7 +115,7 @@ if py3k:
-             return module
-
- else:
--    import imp
-+    import importlib
-
-     def load_module(module_id, path):
-         fp = open(path, "rb")
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
-index a7dc683365..68b6804c78 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for call_trees module."""
-
--import imp
-+import importlib
-
- from tensorflow.python.autograph.converters import call_trees
- from tensorflow.python.autograph.converters import functions
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
-index 81a7fde808..1370f900fd 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for converter module."""
-
--import imp
-+import importlib
-
- from tensorflow.python.autograph.core import converter
- from tensorflow.python.autograph.core import converter_testing
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
-index b93cbb627b..452ec71f5b 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
-@@ -15,7 +15,7 @@
- """Base class for tests in this module."""
-
- import contextlib
--import imp
-+import importlib
- import inspect
- import sys
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
-index 9a62d7c0d2..7ec4fa6dca 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
-@@ -19,7 +19,7 @@ import collections
- import contextlib
- import functools
- import gc
--import imp
-+import importlib
- import inspect
- import os
- import re
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
-index 852af3efe7..6456c50446 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for conversion module."""
-
--import imp
-+import importlib
- import sys
- import types
- import weakref
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
-index a50a64534a..ba0f31afa2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
-@@ -17,7 +17,7 @@
- import abc
- import collections
- import functools
--import imp
-+import importlib
- import textwrap
-
- import six
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
-index 29f38d853a..7ca88fa371 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for templates module."""
-
--import imp
-+import importlib
-
- from absl.testing import parameterized
- import gast
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
-index e46460574b..a40fea6568 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
-@@ -14,7 +14,7 @@
- # =============================================================================
- """Tests for create_python_api."""
-
--import imp
-+import importlib
- import sys
-
- from tensorflow.python.platform import test
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
-index 73d1742714..ea77dd7647 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
-@@ -1,5 +1,5 @@
- import importlib
--import imp
-+import importlib
-
- from .browsers import product_list
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
-index 6a744472b5..9175cb5d34 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
-@@ -1,6 +1,6 @@
- import copy
- import functools
--import imp
-+import importlib
- import io
- import os
- from collections import OrderedDict, defaultdict
-diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
-index 6912b6f3c0..7d851f7f76 100755
---- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
-+++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
-@@ -16,7 +16,7 @@
-
- from __future__ import print_function
-
--import imp
-+import importlib
- import optparse
- import os
- import pipes
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
-index 1c2aba80af..55260d697e 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
-+++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
-@@ -10,7 +10,7 @@ from __future__ import print_function
-
- import os
- import re
--import imp
-+import importlib
-
- from _monkeyYaml import load as yamlLoad
-

extras/packaging/gnu-linux/rules/debian-qt/patches/0015-remove-deleted-xkb-keys.patch

@@ -1,45 +0,0 @@
-diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
-index 8a2769a3ed..584d3620c9 100644
---- a/qtbase/src/corelib/global/qnamespace.h
-+++ b/qtbase/src/corelib/global/qnamespace.h
-@@ -832,10 +832,6 @@ namespace Qt {
-         Key_Dead_Small_Schwa    = 0x0100128a,
-         Key_Dead_Capital_Schwa  = 0x0100128b,
-         Key_Dead_Greek          = 0x0100128c,
--        Key_Dead_Lowline        = 0x01001290,
--        Key_Dead_Aboveverticalline = 0x01001291,
--        Key_Dead_Belowverticalline = 0x01001292,
--        Key_Dead_Longsolidusoverlay = 0x01001293,
-
-         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-         Key_Back  = 0x01000061,
-diff --git a/qtbase/src/corelib/global/qnamespace.qdoc b/qtbase/src/corelib/global/qnamespace.qdoc
-index 78c69176d8..1623517b5a 100644
---- a/qtbase/src/corelib/global/qnamespace.qdoc
-+++ b/qtbase/src/corelib/global/qnamespace.qdoc
-@@ -1654,10 +1654,6 @@
-     \value Key_Dead_Small_Schwa
-     \value Key_Dead_Capital_Schwa
-     \value Key_Dead_Greek
--    \value Key_Dead_Lowline
--    \value Key_Dead_Aboveverticalline
--    \value Key_Dead_Belowverticalline
--    \value Key_Dead_Longsolidusoverlay
-     \value Key_Back
-     \value Key_Forward
-     \value Key_Stop
-diff --git a/qtbase/src/gui/platform/unix/qxkbcommon.cpp b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
-index fc014b38e2..af1cbbd42a 100644
---- a/qtbase/src/gui/platform/unix/qxkbcommon.cpp
-+++ b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
-@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
-         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
--        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
--        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
--        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
--        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-
-         // Special keys from X.org - This include multimedia keys,
-         // wireless/bluetooth/uwb keys, special launcher keys, etc.

extras/packaging/gnu-linux/rules/debian-qt/patches/0016-fix-vaapi.patch

@@ -1,29 +0,0 @@
- qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
-index ec212f5a35..58bf4dce7d 100644
---- a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
-+++ b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
-@@ -37,7 +37,10 @@ static Libs loadLibs()
-     return {};
- }
- 
--constexpr size_t symbolsCount = 39
-+constexpr size_t symbolsCount = 38
-+#if VA_CHECK_VERSION(1, 9, 0)
-+        + 1
-+#endif
- #ifdef DYNAMIC_RESOLVE_VA_DRM_SYMBOLS
-         + 1
- #endif
-@@ -79,7 +82,9 @@ DEFINE_FUNC(vaEndPicture, 2, VA_STATUS_ERROR_OPERATION_FAILED);
- DEFINE_FUNC(vaCreateBuffer, 7, VA_STATUS_ERROR_OPERATION_FAILED);
- DEFINE_FUNC(vaMapBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
- DEFINE_FUNC(vaUnmapBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
-+#if VA_CHECK_VERSION(1, 9, 0)
- DEFINE_FUNC(vaSyncBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
-+#endif
- DEFINE_FUNC(vaDestroyBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
- 
- DEFINE_FUNC(vaCreateSurfaces, 8, VA_STATUS_ERROR_OPERATION_FAILED);

extras/packaging/gnu-linux/rules/debian-qt/patches/series

@@ -1,4 +1,2 @@
-0001-fix-mathops.patch
-0002-fix-binary-tokenizer.patch
-0015-remove-deleted-xkb-keys.patch
-0016-fix-vaapi.patch
+0001-replace_imp_by_importlib.patch
+0002-fix-binary-tokenizer.patch

extras/packaging/gnu-linux/rules/debian/control

@@ -45,6 +45,8 @@ Build-Depends: debhelper (>= 9),
                libvdpau-dev,
                libssl-dev,
                libargon2-dev | libargon2-0-dev,
+# TODO: remove libpipewire-0.2-dev once we stop supporting Ubuntu 20.04
+               libpipewire-0.3-dev | libpipewire-0.2-dev,
 # other
                nasm,
                yasm,
@@ -68,7 +70,7 @@ Depends: gnupg,
 Replaces: jami,
           jami-libclient,
           jami-daemon,
-          libqt-jami (>= 6.5.3),
+          libqt-jami (>= 6.6.1),
 Conflicts: jami,
            jami-libclient,
            jami-libclient-gnome,
@@ -84,7 +86,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          jami-daemon (=${binary:Version}),
-         libqt-jami (>= 6.5.3)
+         libqt-jami (>= 6.6.1)
 Provides: jami-qt
 Replaces: jami-all,
           jami-libclient (<= 20220516.0214.9b42ad3~dfsg1-1)

extras/packaging/gnu-linux/rules/debian/jami-all.postinst

@@ -103,6 +103,8 @@ if [ -f /etc/os-release ]; then
         ENDTAG="ubuntu_23.04"
     elif [ "${UBUNTU_CODENAME}" = "mantic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.10" ]; then
         ENDTAG="ubuntu_23.10"
+    elif [ "${UBUNTU_CODENAME}" = "noble" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_24.04" ]; then
+        ENDTAG="ubuntu_24.04"
     elif [ "${ID}" = "debian" ] && \
              [ "$(command -v lsb_release)" ] && \
              [ "$(lsb_release -rs)" = "testing" ]; then

extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec

@@ -50,6 +50,7 @@ BuildRequires: libuuid-devel
 BuildRequires: libva-devel
 BuildRequires: libvdpau-devel
 BuildRequires: pcre-devel
+BuildRequires: pipewire-devel
 BuildRequires: uuid-devel
 BuildRequires: yaml-cpp-devel
 

extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec

@@ -16,6 +16,9 @@
 %define computed_job_count_ %(echo $(( %available_memory / %memory_required_per_core / %max_parallel_builds )))
 %define computed_job_count %max %computed_job_count_ 1
 %define job_count %min %cpu_count %computed_job_count
+# Exclude vendored Qt6 from dependency generator
+%define __provides_exclude_from ^%{_libdir}/qt-jami/.*$
+%define __requires_exclude ^libQt6.*$
 
 Name:          %{name}
 Version:       %{version}
@@ -26,10 +29,7 @@ License:       GPLv3+
 Vendor:        Savoir-faire Linux Inc.
 URL:           https://jami.net/
 Source:        jami-libqt-%{version}.tar.xz
-Patch0:        0001-fix-mathops.patch
-Patch1:        0002-fix-binary-tokenizer.patch
-Patch2:        0015-remove-deleted-xkb-keys.patch
-Patch3:        0016-fix-vaapi.patch
+Patch0:        0001-fix-gcc14.patch
 
 %global gst 0.10
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -66,9 +66,6 @@ This package contains Qt libraries for Jami.
 %prep
 %setup -n qt-everywhere-src-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 echo "Building Qt using %{job_count} parallel jobs"

extras/packaging/gnu-linux/rules/rpm/jami.spec

@@ -2,6 +2,9 @@
 %define version     RELEASE_VERSION
 %define release     0
 
+# Exclude vendored Qt6 from dependency generator
+%define __requires_exclude ^libQt6.*$
+
 Name:          %{name}
 Version:       %{version}
 Release:       %{release}%{?dist}

extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-gcc14.patch

@@ -0,0 +1,26 @@
+From 9721082687c9529fe6ae3c5304dcf079158e8a77 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 04 Jun 2023 04:15:16 +0100
+Subject: [PATCH] heap: Add missing <algorithm> include for std::remove
+
+GCC 14 changes some internal includes within libstdc++ so this transient
+include gets lost. Include <algorithm> explicitly for std::remove.
+
+Change-Id: Iab8a2c751a0f9c9dc6a770d6296ad6de724ef3bb
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4583222
+Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
+Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#88037}
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h b/qtwebengine/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h
+index 2cf728489d..d8414ae3c6 100644
+--- a/qtwebengine/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h
++++ b/qtwebengine/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+
++#include <algorithm>
+ #include <atomic>
+ #include <vector>

extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-mathops.patch

@@ -1,81 +0,0 @@
-From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
-From: Rémi Denis-Courmont <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] Fix ffmpeg assembly with newer binutil
-
-avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
-
-Deals with: "Error: operand type mismatch for `shr'"
-
-Fixes: QTBUG-116649
-Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-index 6298f5e..ca7e2df 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
-     int rt, dummy;
-+    if (__builtin_constant_p(shift))
-     __asm__ (
-         "imull %3               \n\t"
-         "shrdl %4, %%edx, %%eax \n\t"
-         :"=a"(rt), "=d"(dummy)
--        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-     );
-+    else
-+        __asm__ (
-+            "imull %3               \n\t"
-+            "shrdl %4, %%edx, %%eax \n\t"
-+            :"=a"(rt), "=d"(dummy)
-+            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+        );
-     return rt;
- }
-
-@@ -113,19 +121,31 @@
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("sarl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("sarl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("shrl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("shrl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }

extras/packaging/gnu-linux/rules/rpm/patches/0002-fix-binary-tokenizer.patch

@@ -1,16 +0,0 @@
- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-index 3488120..120e47a 100644
---- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-+++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
-     }
-     catch (const DeadlyImportError& e)
-     {
--        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
-+        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
-             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
-         }
-         throw;

extras/packaging/gnu-linux/rules/rpm/patches/0003-fix-mathops.patch

@@ -1,81 +0,0 @@
-From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
-From: Rémi Denis-Courmont <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] Fix ffmpeg assembly with newer binutil
-
-avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
-
-Deals with: "Error: operand type mismatch for `shr'"
-
-Fixes: QTBUG-116649
-Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-index 6298f5e..ca7e2df 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
-     int rt, dummy;
-+    if (__builtin_constant_p(shift))
-     __asm__ (
-         "imull %3               \n\t"
-         "shrdl %4, %%edx, %%eax \n\t"
-         :"=a"(rt), "=d"(dummy)
--        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-     );
-+    else
-+        __asm__ (
-+            "imull %3               \n\t"
-+            "shrdl %4, %%edx, %%eax \n\t"
-+            :"=a"(rt), "=d"(dummy)
-+            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+        );
-     return rt;
- }
-
-@@ -113,19 +121,31 @@
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("sarl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("sarl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("shrl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("shrl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }

extras/packaging/gnu-linux/rules/rpm/patches/0004-fix-binary-tokenizer.patch

@@ -1,16 +0,0 @@
- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-index 3488120..120e47a 100644
---- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-+++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
-     }
-     catch (const DeadlyImportError& e)
-     {
--        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
-+        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
-             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
-         }
-         throw;

extras/packaging/gnu-linux/rules/rpm/patches/0005-importlib.patch

@@ -1,433 +0,0 @@
- qtbase/src/corelib/debug_script.py                                                                            | 2 +-
- qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
- qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
- qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
- qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
- qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
- .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
- .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
- .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
- .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
- qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
- qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
- 31 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
-index f6207c6104..663c8e0ac1 100644
---- a/qtbase/src/corelib/debug_script.py
-+++ b/qtbase/src/corelib/debug_script.py
-@@ -3,7 +3,7 @@
-
- import os
- import sys
--import imp
-+import importlib
-
- from distutils.version import LooseVersion
-
-diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
-index 681039d34b..a1fe56fa05 100644
---- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
-+++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
-@@ -16,7 +16,7 @@ import subprocess
- import sys
- import tempfile
- import time
--import imp
-+import importlib
-
- # from TestCasePackagerConfig import *
-
-diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
-index 92d4e6139b..7a18e12ced 100644
---- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
-+++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
-@@ -7,7 +7,7 @@ import unittest
-
- import os
- import yaml
--import imp
-+import importlib
-
- # add parent dir to search path
- import sys
-diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
-index c7412927c8..ad2caff318 100755
---- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
-@@ -5,7 +5,7 @@
-
- import os
- import sys
--import imp
-+import importlib
- import tempfile
- import unittest
- import PRESUBMIT
-diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-index 5daee773ba..2d6b124162 100755
---- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-+++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-@@ -9,7 +9,7 @@
- """
- from __future__ import print_function
- import abc
--import imp
-+import importlib
- import optparse
- import os
- import re
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
-index bf626f5479..3fae129aaa 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
-
- import errno
--import imp
-+import importlib
- import os.path
- import sys
-
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
-index ff5753a291..04fc34f742 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import shutil
- import sys
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
-index 32c884a8c0..e761faa54c 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
-index 95a916db08..4331e2fbfa 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
-index 62798631db..28e9dbf705 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
-index cba249b0f3..5a4051827a 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
-index 4a2fefc712..11a9879cb7 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
-
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
-index cc17ae0253..bcc944f06b 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
-index bd72830e54..f2fdc9ae28 100644
---- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import imp
-+import importlib
- import os.path
- import sys
- import unittest
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
-index 1feb303a48..8428de61bb 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
-@@ -6,7 +6,7 @@
- angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
- """
-
--import imp
-+import importlib
- import os
- import unittest
- from angle_presubmit_utils import *
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
-index ed4f38c67b..cac734cefa 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
-@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
-
--import imp
-+import importlib
- import inspect
- import os
- import re
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
-index 0244c9787e..f535afe99c 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
-@@ -32,7 +32,7 @@ if PY3:
-     memoryview_type = memoryview
-     struct_bool_decl = "?"
- else:
--    import imp
-+    import importlib
-     string_types = (unicode,)
-     if PY26 or PY27:
-         binary_types = (str,bytearray)
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
-index 8430390eea..29212205bc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
-@@ -732,7 +732,7 @@ class Environment(object):
-                 )
-                 py_compile = False
-             else:
--                import imp
-+                import importlib
-                 import marshal
-
-                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
-index 06bb8d99f5..05089dc982 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
-@@ -115,7 +115,7 @@ if py3k:
-             return module
-
- else:
--    import imp
-+    import importlib
-
-     def load_module(module_id, path):
-         fp = open(path, "rb")
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
-index a7dc683365..68b6804c78 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for call_trees module."""
-
--import imp
-+import importlib
-
- from tensorflow.python.autograph.converters import call_trees
- from tensorflow.python.autograph.converters import functions
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
-index 81a7fde808..1370f900fd 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for converter module."""
-
--import imp
-+import importlib
-
- from tensorflow.python.autograph.core import converter
- from tensorflow.python.autograph.core import converter_testing
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
-index b93cbb627b..452ec71f5b 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
-@@ -15,7 +15,7 @@
- """Base class for tests in this module."""
-
- import contextlib
--import imp
-+import importlib
- import inspect
- import sys
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
-index 9a62d7c0d2..7ec4fa6dca 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
-@@ -19,7 +19,7 @@ import collections
- import contextlib
- import functools
- import gc
--import imp
-+import importlib
- import inspect
- import os
- import re
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
-index 852af3efe7..6456c50446 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for conversion module."""
-
--import imp
-+import importlib
- import sys
- import types
- import weakref
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
-index a50a64534a..ba0f31afa2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
-@@ -17,7 +17,7 @@
- import abc
- import collections
- import functools
--import imp
-+import importlib
- import textwrap
-
- import six
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
-index 29f38d853a..7ca88fa371 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
-@@ -14,7 +14,7 @@
- # ==============================================================================
- """Tests for templates module."""
-
--import imp
-+import importlib
-
- from absl.testing import parameterized
- import gast
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
-index e46460574b..a40fea6568 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
-@@ -14,7 +14,7 @@
- # =============================================================================
- """Tests for create_python_api."""
-
--import imp
-+import importlib
- import sys
-
- from tensorflow.python.platform import test
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
-index 73d1742714..ea77dd7647 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
-@@ -1,5 +1,5 @@
- import importlib
--import imp
-+import importlib
-
- from .browsers import product_list
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
-index 6a744472b5..9175cb5d34 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
-@@ -1,6 +1,6 @@
- import copy
- import functools
--import imp
-+import importlib
- import io
- import os
- from collections import OrderedDict, defaultdict
-diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
-index 6912b6f3c0..7d851f7f76 100755
---- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
-+++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
-@@ -16,7 +16,7 @@
-
- from __future__ import print_function
-
--import imp
-+import importlib
- import optparse
- import os
- import pipes
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
-index 1c2aba80af..55260d697e 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
-+++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
-@@ -10,7 +10,7 @@ from __future__ import print_function
-
- import os
- import re
--import imp
-+import importlib
-
- from _monkeyYaml import load as yamlLoad
-

extras/packaging/gnu-linux/rules/rpm/patches/0015-remove-deleted-xkb-keys.patch

@@ -1,45 +0,0 @@
-diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
-index 8a2769a3ed..584d3620c9 100644
---- a/qtbase/src/corelib/global/qnamespace.h
-+++ b/qtbase/src/corelib/global/qnamespace.h
-@@ -832,10 +832,6 @@ namespace Qt {
-         Key_Dead_Small_Schwa    = 0x0100128a,
-         Key_Dead_Capital_Schwa  = 0x0100128b,
-         Key_Dead_Greek          = 0x0100128c,
--        Key_Dead_Lowline        = 0x01001290,
--        Key_Dead_Aboveverticalline = 0x01001291,
--        Key_Dead_Belowverticalline = 0x01001292,
--        Key_Dead_Longsolidusoverlay = 0x01001293,
-
-         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-         Key_Back  = 0x01000061,
-diff --git a/qtbase/src/corelib/global/qnamespace.qdoc b/qtbase/src/corelib/global/qnamespace.qdoc
-index 78c69176d8..1623517b5a 100644
---- a/qtbase/src/corelib/global/qnamespace.qdoc
-+++ b/qtbase/src/corelib/global/qnamespace.qdoc
-@@ -1654,10 +1654,6 @@
-     \value Key_Dead_Small_Schwa
-     \value Key_Dead_Capital_Schwa
-     \value Key_Dead_Greek
--    \value Key_Dead_Lowline
--    \value Key_Dead_Aboveverticalline
--    \value Key_Dead_Belowverticalline
--    \value Key_Dead_Longsolidusoverlay
-     \value Key_Back
-     \value Key_Forward
-     \value Key_Stop
-diff --git a/qtbase/src/gui/platform/unix/qxkbcommon.cpp b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
-index fc014b38e2..af1cbbd42a 100644
---- a/qtbase/src/gui/platform/unix/qxkbcommon.cpp
-+++ b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
-@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
-         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
--        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
--        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
--        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
--        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-
-         // Special keys from X.org - This include multimedia keys,
-         // wireless/bluetooth/uwb keys, special launcher keys, etc.

extras/packaging/gnu-linux/rules/rpm/patches/0016-fix-vaapi.patch

@@ -1,29 +0,0 @@
- qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
-index ec212f5a35..58bf4dce7d 100644
---- a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
-+++ b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
-@@ -37,7 +37,10 @@ static Libs loadLibs()
-     return {};
- }
- 
--constexpr size_t symbolsCount = 39
-+constexpr size_t symbolsCount = 38
-+#if VA_CHECK_VERSION(1, 9, 0)
-+        + 1
-+#endif
- #ifdef DYNAMIC_RESOLVE_VA_DRM_SYMBOLS
-         + 1
- #endif
-@@ -79,7 +82,9 @@ DEFINE_FUNC(vaEndPicture, 2, VA_STATUS_ERROR_OPERATION_FAILED);
- DEFINE_FUNC(vaCreateBuffer, 7, VA_STATUS_ERROR_OPERATION_FAILED);
- DEFINE_FUNC(vaMapBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
- DEFINE_FUNC(vaUnmapBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
-+#if VA_CHECK_VERSION(1, 9, 0)
- DEFINE_FUNC(vaSyncBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
-+#endif
- DEFINE_FUNC(vaDestroyBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
- 
- DEFINE_FUNC(vaCreateSurfaces, 8, VA_STATUS_ERROR_OPERATION_FAILED);

extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml

@@ -138,6 +138,10 @@ apps:
     autostart: jami.desktop
     common-id: net.jami.Jami
     desktop: usr/share/applications/jami.desktop
+    environment:
+      PIPEWIRE_CONFIG_NAME: "$SNAP/usr/share/pipewire/pipewire.conf"
+      PIPEWIRE_MODULE_DIR: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pipewire-0.3"
+      SPA_PLUGIN_DIR: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/spa-0.2"
     slots:
     - dbus-jami
     - dbus-ring
@@ -255,6 +259,8 @@ parts:
       sed -i -E 's|(tmpName) << (PACKAGE_NAME << "_shm_")|\1 << "snap.jami." << \2|' ./daemon/src/media/video/sinkclient.cpp
       sed -i -E 's|^Icon=.*|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/jami.svg|' extras/data/jami.desktop
     override-build: |
+      $SNAPCRAFT_PART_BUILD/extras/packaging/gnu-linux/scripts/install-pipewire-from-source.sh
+
       cd $SNAPCRAFT_PART_BUILD/daemon/contrib
       mkdir -p native
       cd native

extras/packaging/gnu-linux/scripts/build-package-debian.sh

@@ -44,6 +44,23 @@ QUILT_REFRESH_ARGS="-p 1"
 
 if [ ! -f "${qt_deb_path}" ] || [ "${FORCE_REBUILD_QT}" = "true" ]; then
     (
+
+        # HACK: For now on ubuntu 24.04 there is no python3.10 package
+        # So create a PyEnv environment to install the required packages
+        if cat /etc/os-release | grep -Eq "24.04"; then
+            apt-get install git gcc make python3-pip libssl-dev curl libreadline-dev -y
+            curl https://pyenv.run | bash
+            export PYENV_ROOT="$HOME/.pyenv"
+            [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+            eval "$(pyenv init -)"
+            pyenv install 3.10.0
+            pyenv local 3.10.0
+
+            python -m pip install html5lib
+            python -m pip install six
+        fi
+
+
         flock 9                 # block until the lock file is gone
         test -f "${qt_deb_path}" && exit 0 # check again
 

extras/packaging/gnu-linux/scripts/build-package-rpm.sh

@@ -35,7 +35,6 @@ rpmdev-setuptree
 
 # Copy the source tarball.
 cp --reflink=auto "/src/$RELEASE_TARBALL_FILENAME" /root/rpmbuild/SOURCES
-
 cp patches/*.patch /root/rpmbuild/SOURCES/
 
 QT_JAMI_PREFIX="/usr/lib64/qt-jami"
@@ -44,7 +43,7 @@ LD_LIBRARY_PATH="${QT_JAMI_PREFIX}/lib:${LD_LIBRARY_PATH}"
 PKG_CONFIG_PATH="${QT_JAMI_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
 CMAKE_PREFIX_PATH="${QT_JAMI_PREFIX}/lib/cmake:${CMAKE_PREFIX_PATH}"
 QT_MAJOR=6
-QT_MINOR=5
+QT_MINOR=6
 QT_PATCH=3
 QT_RELEASE_PATCH=0
 
@@ -54,7 +53,7 @@ QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
 QT_TARBALL_URL=https://download.qt.io/archive/qt/$QT_MAJOR_MINOR/\
 $QT_MAJOR_MINOR_PATCH/single/qt-everywhere-src-$QT_MAJOR_MINOR_PATCH.tar.xz
 
-QT_TARBALL_SHA256="7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb"
+QT_TARBALL_SHA256="69d0348fef415da98aa890a34651e9cfb232f1bffcee289b7b4e21386bf36104"
 QT_TARBALL_FILE_NAME=$(basename "$QT_TARBALL_URL")
 CACHED_QT_TARBALL=$TARBALLS/$QT_TARBALL_FILE_NAME
 
@@ -113,6 +112,8 @@ if [ ! -f "${RPM_PATH}" ]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc38.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_39" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc39.x86_64.rpm "${RPM_PATH}"
+        elif [[ "${DISTRIBUTION}" == "fedora_40" ]]; then
+            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc40.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "alma_9" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.el9.x86_64.rpm "${RPM_PATH}"
         else

extras/packaging/gnu-linux/scripts/install-gcc-debian.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+VERSION=$1
+
+apt-get install -y -o Acquire::Retries=10 \
+    gcc-$VERSION \
+    g++-$VERSION
+
+rm /usr/bin/gcc /usr/bin/g++
+ln -s /usr/bin/gcc-$VERSION /usr/bin/gcc
+ln -s /usr/bin/g++-$VERSION /usr/bin/g++

extras/packaging/gnu-linux/scripts/install-pipewire-from-source.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# The purpose of this script is to build PipeWire from source in a snap based on core20 / Ubuntu 20.04
+# It must be called in the "override-build" section of the relevant part in snapcraft.yaml
+
+set -e
+
+OLD_WD=$(pwd)
+cd /tmp
+
+# Install PipeWire's build dependencies
+apt-get install --yes gcc git libasound2-dev libdbus-1-dev libglib2.0-dev ninja-build pkg-config
+
+# Get a version of Meson that's recent enough to build PipeWire 1.0.5 (the one available via apt is too old)
+wget -q https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz
+echo "feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c  meson-0.61.1.tar.gz" | sha256sum --check
+tar xzf meson-0.61.1.tar.gz
+
+# Build PipeWire 1.0.5 and install it in the /usr directory of the build environment
+wget -q https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.0.5/pipewire-1.0.5.tar.gz
+echo "c5a5de26d684a1a84060ad7b6131654fb2835e03fccad85059be92f8e3ffe993  pipewire-1.0.5.tar.gz" | sha256sum --check
+tar xzf pipewire-1.0.5.tar.gz
+cd pipewire-1.0.5
+../meson-0.61.1/meson.py setup builddir -Dsession-managers=media-session -Dalsa=disabled -Dprefix=/usr
+../meson-0.61.1/meson.py compile -C builddir
+../meson-0.61.1/meson.py install -C builddir
+
+# The files installed by the previous command are only for the "Build" step of the snap
+# creation process (https://snapcraft.io/docs/how-snapcraft-builds). In order to ensure
+# that PipeWire is installed in the final snap archive, we also need to copy all the
+# required files under the $SNAPCRAFT_PART_INSTALL directory.
+../meson-0.61.1/meson.py configure builddir -Dprefix=$SNAPCRAFT_PART_INSTALL/usr/
+../meson-0.61.1/meson.py install -C builddir
+
+# Cleanup
+cd /tmp
+rm -rf meson-0.61.1  meson-0.61.1.tar.gz  pipewire-1.0.5  pipewire-1.0.5.tar.gz
+cd $OLD_WD

extras/packaging/update/sparkle/sparkle-xml-updater.sh

@@ -34,7 +34,7 @@ cat << EOFILE > ${REPO_FOLDER}/${SPARKLE_FILE}
             <pubDate>$DATE_RFC2822</pubDate>
             <sparkle:version>${BUILD}</sparkle:version>
             <sparkle:shortVersionString>${VERSION}</sparkle:shortVersionString>
-            <sparkle:minimumSystemVersion>10.15.0</sparkle:minimumSystemVersion>
+            <sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
             <enclosure url="${REPO_URL}/$(basename ${PACKAGE})" type="application/octet-stream" $(./sign_update ${PACKAGE}) />
         </item>
 $(echo -e "${ITEMS}")

extras/patches/0001-fix-fedora-fc-build.patch

@@ -0,0 +1,25 @@
+From 161d28abb6784115ad71fcb6977e112e9d5756d4 Mon Sep 17 00:00:00 2001
+From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
+Date: Tue, 23 Jan 2024 15:38:34 -0500
+Subject: [PATCH] fix-fedora-fc-build
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0fb89c8..3a6ad6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,7 +65,7 @@ if(NOT TARGET qmsetup::library)
+     )
+ 
+     # Find package again
+-    find_package(qmsetup REQUIRED PATHS ${_package_path})
++    find_package(qmsetup REQUIRED PATHS ${_package_path} ${qmsetup_cmake_path})
+ 
+     # Update import path
+     set(qmsetup_DIR ${_package_path} CACHE PATH "" FORCE)
+-- 
+2.34.1
+

extras/scripts/build-windows.py

@@ -28,7 +28,7 @@ mutually exclusive required arguments:
   -z, --zip         Build portable archive
 
 examples:
-1.  build.py --qt=C:/Qt/6.5.3/msvc2019_64  # Build the app using a specific Qt
+1.  build.py --qt=C:/Qt/6.6.2/msvc2019_64  # Build the app using a specific Qt
 2.  build.py --init pack --msi             # Build the app and an MSI installer
 3.  build.py --init --tests                # Build the app and run tests
     build.py pack --zip --skip-build       # Generate a 7z archive of the app
@@ -280,7 +280,7 @@ def build(config_str, qt_dir, tests):
         "-DCMAKE_INSTALL_PREFIX=" + os.getcwd(),
         "-DCMAKE_SYSTEM_VERSION=" + WIN_SDK_VERSION,
         "-DCMAKE_BUILD_TYPE=" + "Release",
-        "-DENABLE_TESTS=" + str(tests).lower(),
+        "-DBUILD_TESTING=" + str(tests).lower(),
         "-DBETA=" + str((0, 1)[config_str == "Beta"]),
     ]
 

extras/scripts/gen_qml_qrc.py

@@ -62,7 +62,8 @@ def gen_qml_qrc(with_webengine):
                 continue
             filtered = [k for k in files if k.endswith('.qml') or
                         k.endswith('.js') or k.endswith('.html') or
-                        k.endswith('.css') or k.endswith('.conf')]
+                        k.endswith('.css') or k.endswith('.conf') or
+                        k == 'qmldir']
             # if there are no files of interest in this directory, skip it
             if not filtered:
                 continue

extras/scripts/gen_resources_qrc.py

@@ -32,7 +32,7 @@ import re
 # script as set in the project CMakeLists, which should in turn be
 # where the resources.qrc will be located (currently 'src/app').
 resdir = os.path.join('..', '..', 'resources')
-qmlfile = os.path.join('constant', 'JamiResources.qml')
+qmlfile = os.path.join('net/jami/Constants', 'JamiResources.qml')
 resfile = os.path.join('resources.qrc')
 
 print("Generating resource.qrc file ...")

extras/scripts/install.sh

@@ -29,6 +29,8 @@ export OSTYPE
   # -W: disable libwrap and shared library
   # -w: do not use Qt WebEngine
   # -a: arch to build
+  # -A: enable AddressSanitizer
+  # -D: extra CMake flags for the client
 
 set -ex
 
@@ -44,9 +46,11 @@ priv_install=true
 enable_libwrap=true
 enable_webengine=true
 asan=
+extra_cmake_flags=''
 arch=''
+enable_testing=false
 
-while getopts gsc:dQ:P:p:uWwa:A OPT; do
+while getopts gsc:dQ:P:p:uWwa:AtD: OPT; do
   case "$OPT" in
     g)
       global='true'
@@ -81,6 +85,12 @@ while getopts gsc:dQ:P:p:uWwa:A OPT; do
     A)
       asan='true'
     ;;
+    t)
+      enable_testing='true'
+    ;;
+    D)
+      extra_cmake_flags="${OPTARG}"
+    ;;
     \?)
       exit 1
     ;;
@@ -196,6 +206,12 @@ if [ "${asan}" = "true" ]; then
     client_cmake_flags+=(-DENABLE_ASAN=true)
 fi
 
+if [ "${enable_testing}" = "true" ]; then
+    client_cmake_flags+=(-DBUILD_TESTING=On)
+else
+    client_cmake_flags+=(-DBUILD_TESTING=Off)
+fi
+
 if [[ "$OSTYPE" == "darwin"* ]]; then
     #detect arch for macos
     CMAKE_OSX_ARCHITECTURES="arm64"
@@ -220,6 +236,11 @@ else
                          -DWITH_DAEMON_SUBMODULE=true)
 fi
 
+# Add extra flags for the client
+if [ -n "${extra_cmake_flags}" ]; then
+    client_cmake_flags+=(${extra_cmake_flags})
+fi
+
 echo "info: Configuring $client client with flags: ${client_cmake_flags[*]}"
 cmake .. "${client_cmake_flags[@]}"
 make -j"${proc}" V=1

resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
+	<string>11.0</string>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>LSApplicationCategoryType</key>

resources/icons/Receive.svg

@@ -0,0 +1,10 @@
+<svg id="Receive" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
+  <defs>
+    <clipPath id="clip-path">
+      <rect id="Rectangle_429" data-name="Rectangle 429" width="12" height="12" fill="none"/>
+    </clipPath>
+  </defs>
+  <g id="Group_225" data-name="Group 225" clip-path="url(#clip-path)">
+    <path id="Path_333" data-name="Path 333" d="M6.43,8.784,3.007,5.362,4.06,4.309l2.37,2.37,4.314-4.314A5.966,5.966,0,0,0,6,0c-.032,0-.061.008-.094.01A5.98,5.98,0,0,0,.094,5.074,5.911,5.911,0,0,0,0,6a5.911,5.911,0,0,0,.094.926A5.98,5.98,0,0,0,5.906,11.99c.032,0,.061.01.094.01a6,6,0,0,0,5.533-8.32Z" fill="#60c880"/>
+  </g>
+</svg>

resources/icons/incoming-call.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.08" height="22.08" viewBox="0 0 22.08 22.08">
+  <path id="noun-arrow-1167262" d="M35.45,26.488l-4.476,4.476V18.9H28.916V30.964l-4.476-4.476L23,27.955,29.945,34.9l6.971-6.945Z" transform="translate(8.913 -29.202) rotate(45)" stroke="#000" stroke-width="0.5"/>
+</svg>

resources/icons/missed-incoming-call.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8.814" viewBox="0 0 16 8.814">
+  <g id="noun-missed-3555066" transform="translate(-23.455 -28)">
+    <g id="Group_82" data-name="Group 82" transform="translate(23.455 28)">
+      <path id="Path_289" data-name="Path 289" d="M37.727,37.615a2.761,2.761,0,0,1-1.964-.815L31.17,32.211l1.782-1.782,4.589,4.593a.268.268,0,0,0,.368,0l5.852-5.852,1.782,1.782L39.691,36.8A2.761,2.761,0,0,1,37.727,37.615Z" transform="translate(-29.543 -28.802)"/>
+      <path id="Path_290" data-name="Path 290" d="M28.518,35.555H26v-6.3A1.259,1.259,0,0,1,27.259,28h6.3v2.518H28.518Z" transform="translate(-26 -28)"/>
+    </g>
+  </g>
+</svg>

resources/icons/missed-outgoing-call.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8.814" viewBox="0 0 16 8.814">
+  <g id="noun-missed-3555066" transform="translate(-0.001)">
+    <g id="Group_82" data-name="Group 82" transform="translate(0.001)">
+      <path id="Path_289" data-name="Path 289" d="M38.986,37.615A2.761,2.761,0,0,0,40.95,36.8l4.593-4.589-1.782-1.782-4.589,4.593a.268.268,0,0,1-.368,0L32.952,29.17,31.17,30.952,37.022,36.8A2.761,2.761,0,0,0,38.986,37.615Z" transform="translate(-31.17 -28.802)"/>
+      <path id="Path_290" data-name="Path 290" d="M31.036,35.555h2.518v-6.3A1.259,1.259,0,0,0,32.3,28H26v2.518h5.036Z" transform="translate(-17.555 -28)"/>
+    </g>
+  </g>
+</svg>

resources/icons/outgoing-call.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.08" height="22.08" viewBox="0 0 22.08 22.08">
+  <path id="noun-arrow-1167262" d="M12.45,7.589,7.974,12.064V0H5.916V12.064L1.44,7.588,0,9.055,6.945,16l6.971-6.945Z" transform="translate(10.267 21.654) rotate(-135)" stroke="#000" stroke-width="0.5"/>
+</svg>

resources/icons/window-bar_close.svg

@@ -0,0 +1,15 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="10.88" height="10.88"
+  viewBox="0 0 10.88 10.88">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: white;
+        stroke-miterlimit: 10;
+        stroke-width: 1.25px;
+      }
+    </style>
+  </defs>
+  <line class="cls-1" x1="0.44" y1="0.44" x2="10.44" y2="10.44" />
+  <line class="cls-1" x1="0.44" y1="10.44" x2="10.44" y2="0.44" />
+</svg>

resources/icons/window-bar_fullscreen.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1594017175519"
+    class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1933"
+    xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
+    <defs>
+        <style type="text/css"></style>
+    </defs>
+    <path
+        d="M874.666667 128h-170.666667a21.333333 21.333333 0 0 0 0 42.666667h119.168l-176.917333 176.917333a21.333333 21.333333 0 1 0 30.165333 30.165333L853.333333 200.832V320a21.333333 21.333333 0 0 0 42.666667 0V149.333333a21.333333 21.333333 0 0 0-21.333333-21.333333zM347.584 646.250667L170.666667 823.168V704a21.333333 21.333333 0 0 0-42.666667 0v170.666667a21.333333 21.333333 0 0 0 21.333333 21.333333h170.666667a21.333333 21.333333 0 0 0 0-42.666667H200.832l176.917333-176.917333a21.333333 21.333333 0 0 0-30.165333-30.165333zM874.666667 682.666667a21.333333 21.333333 0 0 0-21.333334 21.333333v119.168l-176.917333-176.917333a21.333333 21.333333 0 0 0-30.165333 30.165333L823.168 853.333333H704a21.333333 21.333333 0 0 0 0 42.666667h170.666667a21.333333 21.333333 0 0 0 21.333333-21.333333v-170.666667a21.333333 21.333333 0 0 0-21.333333-21.333333zM200.832 170.666667H320a21.333333 21.333333 0 0 0 0-42.666667H149.333333a21.333333 21.333333 0 0 0-21.333333 21.333333v170.666667a21.333333 21.333333 0 0 0 42.666667 0V200.832l176.917333 176.917333a21.333333 21.333333 0 0 0 30.165333-30.165333z"
+        fill="#ffffff" p-id="1934"></path>
+</svg>

resources/icons/window-bar_maximize.svg

@@ -0,0 +1,12 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: white;
+        stroke-miterlimit: 10;
+      }
+    </style>
+  </defs>
+  <rect class="cls-1" x="0.5" y="0.5" width="9" height="9" />
+</svg>

resources/icons/window-bar_minimize.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	y="0px" viewBox="0 0 10 10" style="enable-background:new 0 0 10 10;" xml:space="preserve">
+	<style type="text/css">
+		.st0 {
+			fill: white;
+		}
+	</style>
+	<rect y="4.5" class="st0" width="10" height="1" />
+</svg>

resources/icons/window-bar_restore.svg

@@ -0,0 +1,16 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: white;
+        stroke-miterlimit: 10;
+      }
+    </style>
+  </defs>
+  <rect class="cls-1" x="0.5" y="2.5" width="9" height="9" />
+  <line class="cls-1" x1="2.5" y1="2.5" x2="2.5" y2="0.5" />
+  <line class="cls-1" x1="12" y1="0.5" x2="2" y2="0.5" />
+  <line class="cls-1" x1="11.5" y1="10" x2="11.5" />
+  <line class="cls-1" x1="10" y1="9.5" x2="12" y2="9.5" />
+</svg>

resources/misc/projectcredits.html

@@ -1,5 +1,6 @@
 <h4 align="left"><span style="font-weight:600"> Created by</span></h4>
-<p>Adrien Béraud<br>
+<p>Abhishek Ojha<br>
+Adrien Béraud<br>
 Albert Babí<br>
 Alexandre Lision<br>
 Alexandr Sergheev<br>
@@ -25,6 +26,7 @@ Emma Falkiewitz<br>
 Emmanuel Lepage-Vallée<br>
 Fadi Shehadeh<br>
 Franck Laurent<br>
+François-Simon Fauteux-Chapleau<br>
 Frédéric Guimont<br>
 Guillaume Heller<br>
 Guillaume Roguez<br>

src/app/.gitignore

@@ -0,0 +1,4 @@
+# auto-gen files
+resources.qrc
+qml.qrc
+net/jami/Constants/JamiResources.qml

src/app/ComponentTestWindow.qml

@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2024 Savoir-faire Linux Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Qt.labs.qmlmodels
+
+import net.jami.Models 1.1
+import net.jami.Adapters 1.1
+import net.jami.Enums 1.1
+import net.jami.Helpers 1.1
+import net.jami.Constants 1.1
+
+import "mainview"
+import "mainview/components"
+import "wizardview"
+import "commoncomponents"
+
+// A window into which we can load a QML file for testing.
+ApplicationWindow {
+    id: appWindow
+    visible: true
+    width: testWidth || loader.implicitWidth || 800
+    height: testHeight || loader.implicitHeight || 600
+    title: testComponentURI
+
+    // WARNING: The following currently must be maintained in tandem with MainApplicationWindow.qml
+    // Used to manage full screen mode and save/restore window geometry.
+    readonly property bool useFrameless: false
+    property bool isRTL: UtilsAdapter.isRTL
+    LayoutMirroring.enabled: isRTL
+    LayoutMirroring.childrenInherit: isRTL
+    property LayoutManager layoutManager: LayoutManager {
+        appContainer: null
+    }
+    // Used to manage dynamic view loading and unloading.
+    property ViewManager viewManager: ViewManager {}
+    // Used to manage the view stack and the current view.
+    property ViewCoordinator viewCoordinator: ViewCoordinator {}
+
+    Loader {
+        id: loader
+
+        source: Qt.resolvedUrl(testComponentURI)
+        onStatusChanged: {
+            console.log("Status changed to:", loader.status)
+            if (loader.status == Loader.Error || loader.status == Loader.Null) {
+                console.error("Couldn't load component:", source)
+                Qt.exit(1);
+            } else if (loader.status == Loader.Ready) {
+                console.info("Loaded component:", source);
+                // If any of the dimensions are not set, set them to the appWindow's dimensions
+                item.width = item.width || Qt.binding(() => appWindow.width);
+                item.height = item.height || Qt.binding(() => appWindow.height);
+            }
+        }
+    }
+
+    // Closing this window should always exit the application.
+    onClosing: Qt.quit()
+
+    // A window to modify properties for Jamified components.
+    // Sometimes we need to modify properties including current conversation ID, account ID, etc.
+    // This window should have a simple layout: a list of editable parameters within a scroll view.
+    Window {
+        id: configTool
+        width: 400
+        height: 400
+        title: "Config tool"
+
+        visible: true
+        // Cannot be closed.
+        flags: Qt.SplashScreen
+
+        // Anchor the window to the right of the parent window.
+        x: appWindow.x + appWindow.width
+        y: appWindow.y
+
+        color: "lightgray"
+
+        Page {
+            anchors.fill: parent
+            header: Control {
+                contentItem: Text {
+                    horizontalAlignment: Text.AlignHCenter
+                    text: "Config tool"
+                }
+                background: Rectangle { color: configTool.color }
+            }
+            contentItem: Control {
+                background: Rectangle { color: Qt.lighter(configTool.color, 1.1) }
+                padding: 10
+                contentItem: ListView {
+                    // Declare types of controls. TODO: add as needed.
+                    Component {
+                        id: checkComponent
+                        CheckBox {
+                            text: label
+                            onCheckedChanged: checkChangedCb(checked)
+                        }
+                    }
+                    Component {
+                        id: comboComponent
+                        Control {
+                            contentItem: RowLayout {
+                                Text { text: label }
+                                ComboBox {
+                                    id: comboBox
+                                    displayText: CurrentConversation.title || "undefined"
+                                    model: getDataModel()
+                                    delegate: ItemDelegate {
+                                        highlighted: comboBox.highlightedIndex === index
+                                        width: parent.width
+                                        text: JamiQmlUtils.getModelData(comboBox.model, index, displayRole)
+                                    }
+                                    onCurrentIndexChanged: onIndexChanged(model, currentIndex)
+                                }
+                            }
+                        }
+                    }
+                    spacing: 5
+                    model: ListModel {
+                        ListElement {
+                            label: "Conversation ID"
+                            type: "combobox"
+                            getDataModel: () => ConversationsAdapter.convListProxyModel
+                            displayRole: ConversationList.Title
+                            onIndexChanged: function(model, index) {
+                                const convUid = JamiQmlUtils.getModelData(model, index, ConversationList.UID);
+                                LRCInstance.selectConversation(convUid);
+                            }
+                        }
+                        ListElement {
+                            label: "Force local preview"
+                            type: "checkbox"
+                            value: false
+                            checkChangedCb: function(checked) {
+                                // Find any child component of type `LocalVideo` and start it.
+                                const localVideo = findChild(loader.item, LocalVideo, "type");
+                                if (localVideo) {
+                                    if (checked) {
+                                        localVideo.startWithId(VideoDevices.getDefaultDevice());
+                                    } else {
+                                        localVideo.startWithId("");
+                                    }
+                                } else {
+                                    console.error("LocalVideo not found");
+                                }
+                            }
+                        }
+                    }
+                    delegate: DelegateChooser {
+                        role: "type"
+                        DelegateChoice {
+                            roleValue: "checkbox"
+                            delegate: checkComponent
+                        }
+                        DelegateChoice {
+                            roleValue: "combobox"
+                            delegate: comboComponent
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // From TestCase.qml, refactored to find a child by type or name.
+    function findChild(parent, searchValue, searchBy = "name") {
+        if (!parent || parent.children === undefined) {
+            console.error("No children found");
+            return null;
+        }
+        // Search directly under the given parent
+        for (var i = 0; i < parent.children.length; ++i) {
+            var child = parent.children[i];
+            var match = false;
+            if (searchBy === "name" && child.objectName === searchValue) {
+                match = true;
+            } else if (searchBy === "type" && child instanceof searchValue) {
+                match = true;
+            }
+            if (match) return child;
+        }
+        // Recursively search in child objects
+        for (i = 0; i < parent.children.length; ++i) {
+            var found = findChild(parent.children[i], searchValue, searchBy);
+            if (found) return found;
+        }
+        return null;
+    }
+}

src/app/LayoutManager.qml

@@ -41,6 +41,20 @@ QtObject {
     // Used to store if a OngoingCallPage component is fullscreened.
     property bool isCallFullscreen: false
 
+    // QWK: Provide spacing for widgets that may be occluded by the system buttons.
+    property QtObject qwkSystemButtonSpacing: QtObject {
+        id: qwkSystemButtonSpacing
+        readonly property bool isMacOS: Qt.platform.os.toString() === "osx"
+        // macOS buttons are on the left.
+        readonly property real left: {
+            appWindow.useFrameless && isMacOS && viewCoordinator.isInSinglePaneMode ? 80 : 0
+        }
+        // Windows and Linux buttons are on the right.
+        readonly property real right: {
+            appWindow.useFrameless && !isMacOS && !root.isFullscreen ? sysBtnsLoader.width + 24 : 0
+        }
+    }
+
     // Restore a visible windowed mode.
     function restoreApp() {
         if (isHidden) {
@@ -73,17 +87,26 @@ QtObject {
     function saveWindowSettings() {
         // If closed-to-tray or minimized or fullscreen, save the cached windowedVisibility
         // value instead.
-        if (isHidden || isFullScreen) {
-            AppSettingsManager.setValue(Settings.WindowState, priv.windowedVisibility)
-        } else {
-            AppSettingsManager.setValue(Settings.WindowState, visibility)
-        }
+        const visibilityToSave = isHidden || isFullScreen ? priv.windowedVisibility : visibility;
 
         // Likewise, don't save fullscreen geometry.
         const geometry = isFullScreen ?
                            priv.windowedGeometry :
                            Qt.rect(appWindow.x, appWindow.y,
-                                   appWindow.width, appWindow.height)
+                                   appWindow.width, appWindow.height);
+
+        // QWK: Account for the frameless window's offset.
+        if (appWindow.useFrameless) {
+            if (Qt.platform.os.toString() !== "osx") {
+                // Add [7, 30, 0, 0] on Windows and GNU/Linux.
+                geometry.x += 7;
+                geometry.y += 30;
+            }
+        }
+
+        console.debug("Saving window: " + JSON.stringify(geometry) + " " + visibilityToSave);
+
+        AppSettingsManager.setValue(Settings.WindowState, visibilityToSave)
         AppSettingsManager.setValue(Settings.WindowGeometry, geometry)
     }
 
@@ -111,6 +134,8 @@ QtObject {
         const visibilityStr = AppSettingsManager.getValue(Settings.WindowState)
         var visibilitySetting = parseInt(visibilityStr)
 
+        console.debug("Restoring window: " + JSON.stringify(geometry) + " " + visibilitySetting)
+
         // We should never restore a hidden or fullscreen state here. Default to normal
         // windowed state in such a case. This shouldn't happen.
         if (visibilitySetting === Window.Hidden || visibilitySetting === Window.FullScreen) {

src/app/MainApplicationWindow.qml

@@ -24,30 +24,28 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
+
 import net.jami.Models 1.1
 import net.jami.Adapters 1.1
 import net.jami.Enums 1.1
 import net.jami.Helpers 1.1
 import net.jami.Constants 1.1
+
 import "mainview"
 import "mainview/components"
 import "wizardview"
 import "commoncomponents"
 
+import QWindowKit
+
 ApplicationWindow {
-    id: root
+    id: appWindow
 
+    readonly property bool useFrameless: UtilsAdapter.getAppValue(Settings.Key.UseFramelessWindow)
     property bool isRTL: UtilsAdapter.isRTL
-
     LayoutMirroring.enabled: isRTL
     LayoutMirroring.childrenInherit: isRTL
 
-    enum LoadedSource {
-        MainView,
-        AccountMigrationView,
-        None
-    }
-
     onActiveFocusItemChanged: {
         focusOverlay.margin = -5;
         if (activeFocusItem && ((activeFocusItem.focusReason === Qt.TabFocusReason) || (activeFocusItem.focusReason === Qt.BacktabFocusReason))) {
@@ -70,7 +68,7 @@ ApplicationWindow {
         sourceComponent: GenericErrorsRow {
             id: genericError
             text: CurrentAccount.enabled ? JamiStrings.noNetworkConnectivity : JamiStrings.disabledAccount
-            height: visible? JamiTheme.chatViewHeaderPreferredHeight : 0
+            height: visible? JamiTheme.qwkTitleBarHeight : 0
         }
     }
 
@@ -88,37 +86,25 @@ ApplicationWindow {
         border.color: JamiTheme.tintedBlue
     }
 
-    property ApplicationWindow appWindow: root
-    property LayoutManager layoutManager: LayoutManager {
-        appContainer: appContainer
-    }
-    property ViewManager viewManager: ViewManager {
-    }
-    property ViewCoordinator viewCoordinator: ViewCoordinator {
-        viewManager: root.viewManager
+    // Used to manage full screen mode and save/restore window geometry.
+    LayoutManager {
+        id: layoutManager
+        appContainer: fullscreenContainer
     }
+    // Used to manage dynamic view loading and unloading.
+    property ViewManager viewManager: ViewManager {}
+    // Used to manage the view stack and the current view.
+    property ViewCoordinator viewCoordinator: ViewCoordinator {}
 
+    // Used to prevent the window from being visible until the
+    // window geometry has been restored and the view stack has
+    // been loaded.
     property bool windowSettingsLoaded: false
+
+    // This setting can be used to block a loading Jami instance
+    // from showNormal() and showMaximized() when starting minimized.
     property bool allowVisibleWindow: true
 
-    function checkLoadedSource() {
-        var sourceString = mainApplicationLoader.source.toString();
-        if (sourceString === JamiQmlUtils.mainViewLoadPath)
-            return MainApplicationWindow.LoadedSource.MainView;
-        return MainApplicationWindow.LoadedSource.None;
-    }
-
-    function startClient() {
-        setMainLoaderSource(JamiQmlUtils.mainViewLoadPath);
-    }
-
-    function setMainLoaderSource(source) {
-        if (checkLoadedSource() === MainApplicationWindow.LoadedSource.MainView) {
-            cleanupMainView();
-        }
-        mainApplicationLoader.setSource(source);
-    }
-
     function cleanupMainView() {
         // Save the main view window size if loading anything else.
         layoutManager.saveWindowSettings();
@@ -130,7 +116,8 @@ ApplicationWindow {
     function close(force = false) {
         // If we're in the onboarding wizard or 'MinimizeOnClose'
         // is set, then we can quit
-        if (force || !UtilsAdapter.getAppValue(Settings.MinimizeOnClose) || !UtilsAdapter.getAccountListSize()) {
+        var minimizeToTray = UtilsAdapter.getAppValue(Settings.MinimizeOnClose) && UtilsAdapter.isSystemTrayIconVisible();
+        if (force || !minimizeToTray || !UtilsAdapter.getAccountListSize()) {
             Qt.quit();
         } else {
             layoutManager.closeToTray();
@@ -139,88 +126,137 @@ ApplicationWindow {
 
     title: JamiStrings.appTitle
 
-    visible: mainApplicationLoader.status === Loader.Ready && windowSettingsLoaded && allowVisibleWindow
+    visible: mainViewLoader.status === Loader.Ready && windowSettingsLoaded && allowVisibleWindow
 
-    // To facilitate reparenting of the callview during
-    // fullscreen mode, we need QQuickItem based object.
-    Item {
-        id: appContainer
+    Connections {
+        id: connectionMigrationEnded
 
-        anchors.fill: parent
+        target: CurrentAccountToMigrate
+
+        function onAccountNeedsMigration(accountId) {
+            viewCoordinator.present("AccountMigrationView");
+        }
+
+        function onAllMigrationsFinished() {
+            viewCoordinator.dismiss("AccountMigrationView");
+            viewCoordinator.present("WelcomePage");
+        }
+    }
+
+    function initMainView(view) {
+        console.info("Initializing main view");
+
+        // Main window, load any valid app settings, and allow the
+        // layoutManager to handle as much as possible.
+        layoutManager.restoreWindowSettings();
+
+        // QWK: setup
+        if (useFrameless) {
+            windowAgent.setTitleBar(titleBar);
+            // Now register the system buttons (non-macOS).
+            if (sysBtnsLoader.item) {
+                const sysBtns = sysBtnsLoader.item;
+                windowAgent.setSystemButton(WindowAgent.Minimize, sysBtns.minButton);
+                windowAgent.setSystemButton(WindowAgent.Maximize, sysBtns.maxButton);
+                windowAgent.setSystemButton(WindowAgent.Close, sysBtns.closeButton);
+            }
+        }
+
+        // Set the viewCoordinator's root item.
+        viewCoordinator.init(view);
+
+        // Navigate to something.
+        if (UtilsAdapter.getAccountListSize() > 0) {
+            // Already have an account.
+            if (CurrentAccountToMigrate.accountToMigrateListSize > 0)
+                // Do we need to migrate any accounts?
+                viewCoordinator.present("AccountMigrationView");
+            else
+                // Okay now just start the client normally.
+                viewCoordinator.present("WelcomePage");
+        } else {
+            // No account, so start the wizard.
+            viewCoordinator.present("WizardView");
+        }
+
+        // Set up the event filter for macOS.
+        if (Qt.platform.os.toString() === "osx") {
+            MainApplication.setEventFilter();
+        }
+
+        // Quiet check for updates on start if set to.
+        if (Qt.platform.os.toString() === "windows") {
+            if (UtilsAdapter.getAppValue(Settings.AutoUpdate)) {
+                AppVersionManager.checkForUpdates(true);
+                AppVersionManager.setAutoUpdateCheck(true);
+            }
+        }
+
+        // Handle a start URI if set as start option.
+        MainApplication.handleUriAction();
+
+        // This will allow visible to become true if not starting minimized.
+        windowSettingsLoaded = true;
+    }
+
+    Component.onCompleted: {
+        // QWK: setup
+        if (useFrameless) {
+            windowAgent.setup(appWindow);
+        }
+
+        mainViewLoader.active = true;
+
+        // Dbus error handler for Linux.
+        if (Qt.platform.os.toString() !== "windows" && Qt.platform.os.toString() !== "osx")
+            DBusErrorHandler.setActive(true);
     }
 
     Loader {
-        id: mainApplicationLoader
-
+        id: mainViewLoader
+        active: false
+        source: "qrc:/mainview/MainView.qml"
         anchors.fill: parent
-        z: -1
+        onLoaded: initMainView(item)
+    }
 
-        asynchronous: true
-        visible: status == Loader.Ready
+    // Use this as a parent for fullscreen items.
+    Item {
+        id: fullscreenContainer
+        anchors.fill: parent
+    }
 
-        Connections {
-            id: connectionMigrationEnded
-
-            target: CurrentAccountToMigrate
-
-            function onAccountNeedsMigration(accountId) {
-                viewCoordinator.present("AccountMigrationView");
-            }
-
-            function onAllMigrationsFinished() {
-                viewCoordinator.dismiss("AccountMigrationView");
-                startClient();
-            }
+    // QWK: Window Title bar
+    Item {
+        id: titleBar
+        height: JamiTheme.qwkTitleBarHeight
+        anchors {
+            top: parent.top
+            right: parent.right
+            left: parent.left
         }
 
-        // Set `visible = false` when loading a new QML file.
-        onSourceChanged: windowSettingsLoaded = false
-
-        onLoaded: {
-            if (UtilsAdapter.getAccountListSize() === 0) {
-                layoutManager.restoreWindowSettings();
-                if (!viewCoordinator.rootView)
-                    // Set the viewCoordinator's root item.
-                    viewCoordinator.init(item);
-                viewCoordinator.present("WizardView");
-            } else {
-                // Main window, load any valid app settings, and allow the
-                // layoutManager to handle as much as possible.
-                layoutManager.restoreWindowSettings();
-
-                // Present the welcome view once the viewCoordinator is setup.
-                viewCoordinator.initialized.connect(function () {
-                        viewCoordinator.preload("SidePanel");
-                        viewCoordinator.preload("SettingsSidePanel");
-                        viewCoordinator.present("WelcomePage");
-                        viewCoordinator.preload("ConversationView");
-                    });
-                if (!viewCoordinator.rootView)
-                    // Set the viewCoordinator's root item.
-                    viewCoordinator.init(item);
-                if (CurrentAccountToMigrate.accountToMigrateListSize > 0)
-                    viewCoordinator.present("AccountMigrationView");
+        // On Windows and Linux, use custom system buttons.
+        Loader {
+            id: sysBtnsLoader
+            active: Qt.platform.os.toString() !== "osx" && useFrameless
+            height: titleBar.height
+            anchors {
+                top: parent.top
+                right: parent.right
+                // Note: leave these margins, they prevent image scaling artifacts
+                topMargin: 1
+                rightMargin: 1
             }
-            if (Qt.platform.os.toString() === "osx") {
-                MainApplication.setEventFilter();
-            }
-
-            // This will trigger `visible = true`.
-            windowSettingsLoaded = true;
-
-            // Quiet check for updates on start if set to.
-            if (Qt.platform.os.toString() === "windows") {
-                if (UtilsAdapter.getAppValue(Settings.AutoUpdate)) {
-                    AppVersionManager.checkForUpdates(true);
-                    AppVersionManager.setAutoUpdateCheck(true);
-                }
-            }
-
-            // Handle a start URI if set as start option.
-            MainApplication.handleUriAction();
+            source: "qrc:/commoncomponents/QWKSystemButtonGroup.qml"
         }
     }
 
+    // QWK: Main interop component.
+    WindowAgent {
+        id: windowAgent
+    }
+
     Connections {
         target: LRCInstance
 
@@ -234,6 +270,12 @@ ApplicationWindow {
             raise();
             layoutManager.restoreApp();
         }
+
+        function onCurrentAccountRemoved() {
+            if (UtilsAdapter.getAccountListSize() === 0) {
+                viewCoordinator.present("WizardView");
+            }
+        }
     }
 
     Connections {
@@ -339,11 +381,5 @@ ApplicationWindow {
         }
     }
 
-    onClosing: root.close()
-
-    Component.onCompleted: {
-        startClient();
-        if (Qt.platform.os.toString() !== "windows" && Qt.platform.os.toString() !== "osx")
-            DBusErrorHandler.setActive(true);
-    }
+    onClosing: appWindow.close()
 }

src/app/ViewCoordinator.qml

@@ -24,14 +24,6 @@ import "commoncomponents"
 QtObject {
     id: root
 
-    required property QtObject viewManager
-
-    signal initialized
-
-    function requestAppWindowWizardView() {
-        viewCoordinator.present("WizardView");
-    }
-
     // A map of view names to file paths for QML files that define each view.
     property variant resources: {
         "SidePanel": "mainview/components/SidePanel.qml",
@@ -47,12 +39,44 @@ QtObject {
     // The `main` view of the application window.
     property StackView rootView
 
-    property var currentViewName: rootView && rootView.currentItem && rootView.currentItem.objectName || null
+    readonly property Item currentView: rootView && rootView.currentItem || null
+    readonly property var currentViewName: currentView && currentView.objectName || null
+    readonly property bool isDualPane: currentView && currentView instanceof DualPaneView
+    readonly property bool isInSinglePaneMode: !isDualPane || currentView.isSinglePane
+    readonly property bool isRTL: Qt.application.layoutDirection === Qt.RightToLeft
+    // A list of the current visible views. This could be a single view or two views in
+    // dual pane mode. The list is ordered [minor, major] where major is the view on the
+    // right side when not in RTL and should represent the main or content-type view.
+    readonly property var visibleViews: {
+        if (!currentView)
+            return []
+        if (isDualPane) {
+            if (isInSinglePaneMode)
+                return [currentView.rightPaneItem]
+            return [currentView.leftPaneItem, currentView.rightPaneItem]
+        }
+        return [currentView]
+    }
+    // Aggregate this info and expose it as a single string for convenience.
+    // JSON indented by 2 spaces.
+    readonly property string currentViewInfo: {
+        var info = {
+            currentViewName: currentViewName,
+            isDualPane: isDualPane,
+            isInSinglePaneMode: isInSinglePaneMode,
+            visibleViews: visibleViews.map(function(view) {
+                return view && view.objectName || null;
+            }),
+            visibleViewWidths: visibleViews.map(function(view) {
+                return view && view.width || null;
+            }),
+        };
+        return JSON.stringify(info, null, 2);
+    }
 
     function init(mainStackView) {
         rootView = Qt.createQmlObject(`import QtQuick; import QtQuick.Controls
                                       StackView { anchors.fill: parent }`, mainStackView);
-        initialized();
     }
 
     function deinit() {
@@ -171,6 +195,8 @@ QtObject {
                 var objectName = view ? view.objectName : obj.objectName;
                 if (!viewManager.destroyView(resources[objectName])) {
                     print("could not destroy view:", objectName);
+                } else {
+                    print("destroyed view:", objectName);
                 }
             } else
                 view.dismissed();
@@ -197,8 +223,20 @@ QtObject {
         }
     }
 
-    function getView(viewName) {
-        return viewManager.getView(viewName);
+    function getView(viewName, forceCreate = false) {
+        // If the view is already loaded, return it.
+        var view = viewManager.getView(viewName);
+        if (view)
+            return view;
+        if (!forceCreate)
+            return null;
+        // Otherwise, create it.
+        view = viewManager.createView(resources[viewName], null);
+        if (!view) {
+            console.log("Failed to load view: " + viewName);
+            return null;
+        }
+        return view;
     }
 
     // Load a view without presenting it.

src/app/accountadapter.cpp

@@ -22,7 +22,9 @@
 
 #include "appsettingsmanager.h"
 #include "qtutils.h"
-#include "qmlregister.h"
+#include "systemtray.h"
+#include "lrcinstance.h"
+#include "accountlistmodel.h"
 
 #include <QtConcurrent/QtConcurrent>
 
@@ -33,14 +35,7 @@ AccountAdapter::AccountAdapter(AppSettingsManager* settingsManager,
     : QmlAdapterBase(instance, parent)
     , settingsManager_(settingsManager)
     , systemTray_(systemTray)
-    , accountListModel_(new AccountListModel(instance))
-    , deviceItemListModel_(new DeviceItemListModel(instance, parent))
-    , moderatorListModel_(new ModeratorListModel(instance, parent))
 {
-    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, accountListModel_.get(), "AccountListModel");
-    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, deviceItemListModel_.get(), "DeviceItemListModel");
-    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, moderatorListModel_.get(), "ModeratorListModel");
-
     connect(&lrcInstance_->accountModel(),
             &AccountModel::accountStatusChanged,
             this,
@@ -53,8 +48,13 @@ AccountAdapter::AccountAdapter(AppSettingsManager* settingsManager,
 
     connect(systemTray_,
             &SystemTray::countChanged,
-            accountListModel_.get(),
+            qApp->property("AccountListModel").value<AccountListModel*>(),
             &AccountListModel::updateNotifications);
+
+    // Switch account to the specified index when an account is added.
+    connect(this, &AccountAdapter::accountAdded, this, [this](const QString&, int index) {
+        changeAccount(index);
+    });
 }
 
 AccountModel*
@@ -63,6 +63,14 @@ AccountAdapter::getModel()
     return &(lrcInstance_->accountModel());
 }
 
+AccountAdapter*
+AccountAdapter::create(QQmlEngine*, QJSEngine*)
+{
+    return new AccountAdapter(qApp->property("AppSettingsManager").value<AppSettingsManager*>(),
+                              qApp->property("SystemTray").value<SystemTray*>(),
+                              qApp->property("LRCInstance").value<LRCInstance*>());
+}
+
 void
 AccountAdapter::changeAccount(int row)
 {
@@ -219,7 +227,7 @@ AccountAdapter::createJAMSAccount(const QVariantMap& settings)
         &lrcInstance_->accountModel(),
         &lrc::api::AccountModel::accountAdded,
         [this](const QString& accountId) {
-            if (!lrcInstance_->accountModel().getAccountList().size())
+            if (!lrcInstance_->accountModel().getAccountCount())
                 return;
 
             Utils::oneShotConnect(&lrcInstance_->accountModel(),

src/app/accountadapter.h

@@ -20,21 +20,20 @@
 
 #include "qmladapterbase.h"
 
-#include "accountlistmodel.h"
-#include "deviceitemlistmodel.h"
-#include "moderatorlistmodel.h"
-#include "systemtray.h"
-#include "lrcinstance.h"
-#include "utils.h"
+#include "api/accountmodel.h"
 
 #include <QSettings>
 #include <QString>
+#include <QQmlEngine>   // QML registration
+#include <QApplication> // QML registration
 
 class AppSettingsManager;
+class SystemTray;
 
 class AccountAdapter final : public QmlAdapterBase
 {
     Q_OBJECT
+    QML_SINGLETON
 
     Q_PROPERTY(lrc::api::AccountModel* model READ getModel NOTIFY modelChanged)
 
@@ -45,6 +44,8 @@ Q_SIGNALS:
     void modelChanged();
 
 public:
+    static AccountAdapter* create(QQmlEngine*, QJSEngine*);
+
     explicit AccountAdapter(AppSettingsManager* settingsManager,
                             SystemTray* systemTray,
                             LRCInstance* instance,
@@ -100,9 +101,5 @@ private:
 
     AppSettingsManager* settingsManager_;
     SystemTray* systemTray_;
-
-    QScopedPointer<AccountListModel> accountListModel_;
-    QScopedPointer<DeviceItemListModel> deviceItemListModel_;
-    QScopedPointer<ModeratorListModel> moderatorListModel_;
 };
 Q_DECLARE_METATYPE(AccountAdapter*)

src/app/accountlistmodel.cpp

@@ -20,11 +20,8 @@
 #include "accountlistmodel.h"
 
 #include "lrcinstance.h"
-#include "utils.h"
 
 #include "api/account.h"
-#include "api/contact.h"
-#include "api/conversation.h"
 
 #include <QDateTime>
 
@@ -38,7 +35,7 @@ int
 AccountListModel::rowCount(const QModelIndex& parent) const
 {
     if (!parent.isValid() && lrcInstance_) {
-        return lrcInstance_->accountModel().getAccountList().size();
+        return lrcInstance_->accountModel().getAccountCount();
     }
     return 0;
 }
@@ -74,7 +71,7 @@ AccountListModel::data(const QModelIndex& index, int role) const
 void
 AccountListModel::updateNotifications()
 {
-    for (int i = 0; i < lrcInstance_->accountModel().getAccountList().size(); ++i) {
+    for (int i = 0; i < lrcInstance_->accountModel().getAccountCount(); ++i) {
         QModelIndex modelIndex = QAbstractListModel::index(i, 0);
         Q_EMIT dataChanged(modelIndex, modelIndex, {Role::NotificationCount});
     }

src/app/accountlistmodel.h

@@ -51,11 +51,9 @@ public:
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-    // reset the model when there's new account added
     Q_INVOKABLE void reset();
-
     void updateNotifications();
 
-protected:
+private:
     using Role = AccountList::Role;
 };

src/app/appsettingsmanager.cpp

@@ -20,6 +20,8 @@
 
 #include "appsettingsmanager.h"
 
+#include "global.h"
+
 #include <QCoreApplication>
 #include <QLibraryInfo>
 
@@ -101,7 +103,7 @@ AppSettingsManager::loadTranslations()
     installedTr_.clear();
 
     QString locale_name = getLanguage();
-    qDebug() << QString("Using locale: %1").arg(locale_name);
+    C_INFO << QString("Using locale: %1").arg(locale_name);
     QString locale_lang = locale_name.split('_')[0];
 
     QTranslator* qtTranslator_lang = new QTranslator(qApp);

src/app/appsettingsmanager.h

@@ -33,13 +33,20 @@
 extern const QString defaultDownloadPath;
 
 // clang-format off
+
+// Define USE_FRAMELESS_WINDOW_DEFAULT based on the platform
+#ifdef Q_OS_LINUX
+#define USE_FRAMELESS_WINDOW_DEFAULT false
+#else
+#define USE_FRAMELESS_WINDOW_DEFAULT true
+#endif
+
 // Common key-value pairs for both APPSTORE and non-APPSTORE builds
 #define COMMON_KEYS \
-    X(MinimizeOnClose, false) \
+    X(MinimizeOnClose, true) \
     X(DownloadPath, defaultDownloadPath) \
     X(ScreenshotPath, {}) \
     X(EnableNotifications, true) \
-    X(EnableTypingIndicator, true) \
     X(EnableReadReceipt, true) \
     X(AcceptTransferBelow, 20) \
     X(AutoAcceptFiles, true) \
@@ -66,8 +73,9 @@ extern const QString defaultDownloadPath;
     X(ChatViewEnterIsNewLine, false) \
     X(ShowSendOption, false) \
     X(EnablePtt, false) \
-    X(PttKeys, 32)
-#ifdef APPSTORE
+    X(PttKeys, 32) \
+    X(UseFramelessWindow, USE_FRAMELESS_WINDOW_DEFAULT)
+#if APPSTORE
 #define KEYS COMMON_KEYS
 #else
 // Additional key-value pairs for non-APPSTORE builds including donation

src/app/avadapter.cpp

@@ -25,7 +25,11 @@
 #include "api/devicemodel.h"
 
 #ifdef Q_OS_LINUX
+#include "screencastportal.h"
 #include "xrectsel.h"
+#ifndef ENABLE_LIBWRAP
+#include <sys/prctl.h>
+#endif
 #endif
 
 #include <QtConcurrent/QtConcurrent>
@@ -58,6 +62,12 @@ AvAdapter::AvAdapter(LRCInstance* instance, QObject* parent)
             &lrc::api::AVModel::onRendererFpsChange,
             this,
             &AvAdapter::updateRenderersFPSInfo);
+#ifdef Q_OS_LINUX
+    connect(&lrcInstance_->behaviorController(),
+            &BehaviorController::callStatusChanged,
+            this,
+            &AvAdapter::onCallStatusChanged);
+#endif
 }
 
 // The top left corner of primary screen is (0, 0).
@@ -119,6 +129,93 @@ AvAdapter::shareEntireScreen(int screenNumber)
         ->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING);
 }
 
+#ifdef Q_OS_LINUX
+static std::map<QString, std::unique_ptr<ScreenCastPortal>> callPortal;
+
+void
+AvAdapter::onCallStatusChanged(const QString& accountId, const QString& callId)
+{
+    auto& accInfo = lrcInstance_->accountModel().getAccountInfo(accountId);
+    auto& callModel = accInfo.callModel;
+    const auto call = callModel->getCall(callId);
+
+    if (call.status == lrc::api::call::Status::ENDED) {
+        closePortal(callId);
+    }
+}
+
+void
+AvAdapter::closePortal(const QString& callId)
+{
+    if (callPortal.count(callId)) {
+        lrcInstance_->avModel().stopPreview(callPortal[callId]->videoInputId);
+        callPortal.erase(callId);
+    }
+}
+
+void
+AvAdapter::shareWayland(bool entireScreen)
+{
+    QString callId = lrcInstance_->getCurrentCallId();
+    closePortal(callId);
+
+    PortalCaptureType captureType = entireScreen ? PortalCaptureType::SCREEN
+                                                 : PortalCaptureType::WINDOW;
+    auto portal = std::make_unique<ScreenCastPortal>(captureType);
+
+    int err = portal->getPipewireFd();
+    if (err == EACCES) {
+        qInfo() << "Can't share screen: permission denied";
+        return;
+    } else if (err != 0) {
+        qWarning() << "Failed to get PipeWire fd. Error code:" << err;
+        return;
+    }
+    QString resource = QString("%1%2pipewire pid:%3 fd:%4 node:%5")
+                           .arg(libjami::Media::VideoProtocolPrefix::DISPLAY)
+                           .arg(libjami::Media::VideoProtocolPrefix::SEPARATOR)
+                           .arg(getpid())
+                           .arg(portal->pipewireFd)
+                           .arg(portal->pipewireNode);
+#ifndef ENABLE_LIBWRAP
+    // If the daemon is running as a separate process, then it can't directly use the
+    // PipeWire file descriptor opened by the client, so it will attempt to duplicate
+    // it using the pidfd_getfd system call. This requires the daemon process to have
+    // ptrace permission on the client process. On some systems, this will be true by
+    // default (as long as the client and daemon processes have the same uid), but it
+    // may not be if the Yama Linux Security Module is used. The call to prctl below
+    // will grant permission if the Yama LSM is enabled and set to mode 1.
+    //
+    // References:
+    // https://man7.org/linux/man-pages/man2/pidfd_getfd.2.html
+    // https://man7.org/linux/man-pages/man2/prctl.2.html
+    // https://github.com/torvalds/linux/blob/master/Documentation/admin-guide/LSM/Yama.rst
+    prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY);
+#endif
+    // We open the video input here (instead of letting the daemon do it) to ensure
+    // that the daemon doesn't try to restart it while we still need it, since this
+    // would require getting a new file descriptor for PipeWire.
+    portal->videoInputId = lrcInstance_->avModel().startPreview(resource);
+
+    callPortal[callId] = std::move(portal);
+    muteCamera_ = !isCapturing();
+    lrcInstance_->getCurrentCallModel()
+        ->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING);
+}
+
+void
+AvAdapter::shareEntireScreenWayland()
+{
+    shareWayland(true);
+}
+
+void
+AvAdapter::shareWindowWayland()
+{
+    shareWayland(false);
+}
+#endif // Q_OS_LINUX
+
 void
 AvAdapter::shareAllScreens()
 {
@@ -204,10 +301,14 @@ AvAdapter::shareFile(const QString& filePath)
                               &lrc::api::AVModel::fileOpened,
                               this,
                               [this, callId, filePath, resource](bool hasAudio, bool hasVideo) {
-                                    lrcInstance_->avModel().setAutoRestart(resource, true);
-                                    lrcInstance_->getCurrentCallModel()
-                                        ->addMedia(callId, filePath, lrc::api::CallModel::MediaRequestType::FILESHARING, false, hasAudio);
-                                    lrcInstance_->avModel().pausePlayer(resource, false);
+                                  lrcInstance_->avModel().setAutoRestart(resource, true);
+                                  lrcInstance_->getCurrentCallModel()
+                                      ->addMedia(callId,
+                                                 filePath,
+                                                 lrc::api::CallModel::MediaRequestType::FILESHARING,
+                                                 false,
+                                                 hasAudio);
+                                  lrcInstance_->avModel().pausePlayer(resource, false);
                               });
 
         lrcInstance_->avModel().createMediaPlayer(resource);
@@ -307,6 +408,9 @@ void
 AvAdapter::stopSharing(const QString& source)
 {
     auto callId = lrcInstance_->getCurrentCallId();
+#ifdef Q_OS_LINUX
+    closePortal(callId);
+#endif
     if (!source.isEmpty() && !callId.isEmpty()) {
         if (source.startsWith(libjami::Media::VideoProtocolPrefix::DISPLAY)) {
             qDebug() << "Stopping display: " << source;

src/app/avadapter.h

@@ -20,23 +20,31 @@
 
 #include "qmladapterbase.h"
 #include "lrcinstance.h"
+#include "qtutils.h"
+#include "rendererinformationlistmodel.h"
 
 #include <QObject>
 #include <QVariant>
 #include <QString>
-#include <qtutils.h>
-
-#include "rendererinformationlistmodel.h"
+#include <QQmlEngine>   // QML registration
+#include <QApplication> // QML registration
 
 class AvAdapter final : public QmlAdapterBase
 {
     Q_OBJECT
+    QML_SINGLETON
+
     QML_PROPERTY(bool, muteCamera)
     QML_RO_PROPERTY(QStringList, windowsNames)
     QML_RO_PROPERTY(QList<QVariant>, windowsIds)
     QML_RO_PROPERTY(QVariant, renderersInfoList)
 
 public:
+    static AvAdapter* create(QQmlEngine*, QJSEngine*)
+    {
+        return new AvAdapter(qApp->property("LRCInstance").value<LRCInstance*>());
+    }
+
     explicit AvAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~AvAdapter() = default;
 
@@ -61,9 +69,18 @@ protected:
      */
     Q_INVOKABLE bool hasCamera() const;
 
-    // Share the screen specificed by screen number.
+    // Share the screen specificed by screen number (all platforms except Wayland).
     Q_INVOKABLE void shareEntireScreen(int screenNumber);
 
+#ifdef Q_OS_LINUX
+    // Share a screen on Wayland.
+    // Sharing a screen on Wayland requires getting permission from the user. The logic for
+    // this is handled by the ScreenCastPortal class using xdg-desktop-portal.
+    // The choice of screen is also handled by xdg-desktop-portal, which is why we don't need
+    // an argument for it (whereas we do on other platforms, cf. shareEntireScreen above).
+    Q_INVOKABLE void shareEntireScreenWayland();
+#endif
+
     // Share the all screens connected.
     Q_INVOKABLE void shareAllScreens();
 
@@ -79,9 +96,18 @@ protected:
     // Select screen area to display (from all screens).
     Q_INVOKABLE void shareScreenArea(unsigned x, unsigned y, unsigned width, unsigned height);
 
-    // Select window to display.
+    // Select window to display (all platforms except Wayland).
     Q_INVOKABLE void shareWindow(const QString& windowProcessId, const QString& windowId);
 
+#ifdef Q_OS_LINUX
+    // Share a window on Wayland.
+    // Sharing a window on Wayland requires getting permission from the user. The logic for
+    // this is handled by the ScreenCastPortal class using xdg-desktop-portal.
+    // The choice of window is also handled by xdg-desktop-portal, which is why we don't need
+    // arguments for it (whereas we do on other platforms, cf. shareWindow above).
+    Q_INVOKABLE void shareWindowWayland();
+#endif
+
     // Returns the screensharing resource
     Q_INVOKABLE QString getSharingResource(int screenId = -2,
                                            const QString& windowProcessId = "",
@@ -113,11 +139,25 @@ private Q_SLOTS:
     void onAudioDeviceEvent();
     void onRendererStarted(const QString& id, const QSize& size);
     void onRendererStopped(const QString& id);
+#ifdef Q_OS_LINUX
+    // This function needs to be called whenever a screen/window share stops on Wayland.
+    // Failure to do so can cause subsequent sharing attempts to fail.
+    void closePortal(const QString& callId);
+
+    // On Wayland, we need to be informed of call status changes so that we can call
+    // closePortal if a call ends while a screen/window share was in progress.
+    void onCallStatusChanged(const QString& accountId, const QString& callId);
+#endif
 
 private:
     // Get screens arrangement rect relative to primary screen.
     const QRect getAllScreensBoundingRect();
 
+#ifdef Q_OS_LINUX
+    // Used internally by shareEntireScreenWayland and shareWindowWayland
+    void shareWayland(bool entireScreen);
+#endif
+
     // Get the screen number
     int getScreenNumber(int screenId = 0) const;
 

src/app/avatarimageprovider.h

@@ -25,52 +25,74 @@
 
 #include <QImage>
 
-class AvatarImageProvider : public QuickImageProviderBase
+class AsyncAvatarImageResponseRunnable : public AsyncImageResponseRunnable
 {
+    Q_OBJECT
 public:
-    AvatarImageProvider(LRCInstance* instance = nullptr)
-        : QuickImageProviderBase(QQuickImageProvider::Image,
-                                 QQmlImageProviderBase::ForceAsynchronousImageLoading,
-                                 instance)
+    AsyncAvatarImageResponseRunnable(const QString& id,
+                                     const QSize& requestedSize,
+                                     LRCInstance* lrcInstance)
+        : AsyncImageResponseRunnable(id, requestedSize, lrcInstance)
     {}
 
-    QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize) override
+    void run() override
     {
-        Q_UNUSED(size)
-
-        if (requestedSize == QSize(0, 0)) {
-            qWarning() << Q_FUNC_INFO << "Image request has no dimensions";
-            return {};
+        // For avatar images, the requested size should be a square. Anything else
+        // is a request made prior to an aspect ratio guard calculation.
+        if (requestedSize_ == QSize(0, 0) || requestedSize_.width() != requestedSize_.height()) {
+            return;
         }
 
         // the first string is the item uri and the second is a uid
         // that is used for trigger a reload of the underlying image
         // data and can be discarded at this point
-        auto idInfo = id.split("_");
+        auto idInfo = id_.split("_");
 
         if (idInfo.size() < 2) {
             qWarning() << Q_FUNC_INFO << "Missing element(s) in the image url";
-            return {};
+            return;
         }
 
         const auto& imageId = idInfo.at(1);
         if (!imageId.size()) {
             qWarning() << Q_FUNC_INFO << "Missing id in the image url";
-            return {};
+            return;
         }
 
+        QImage image;
         const auto& type = idInfo.at(0);
+
         if (type == "conversation") {
             if (imageId == "temp")
-                return Utils::tempConversationAvatar(requestedSize);
-            return Utils::conversationAvatar(lrcInstance_, imageId, requestedSize);
+                image = Utils::tempConversationAvatar(requestedSize_);
+            else
+                image = Utils::conversationAvatar(lrcInstance_, imageId, requestedSize_);
+        } else if (type == "account") {
+            image = Utils::accountPhoto(lrcInstance_, imageId, requestedSize_);
+        } else if (type == "contact") {
+            image = Utils::contactPhoto(lrcInstance_, imageId, requestedSize_);
+        } else {
+            qWarning() << Q_FUNC_INFO << "Missing valid prefix in the image url";
+            return;
         }
-        if (type == "account")
-            return Utils::accountPhoto(lrcInstance_, imageId, requestedSize);
-        if (type == "contact")
-            return Utils::contactPhoto(lrcInstance_, imageId, requestedSize);
 
-        qWarning() << Q_FUNC_INFO << "Missing valid prefix in the image url";
-        return {};
+        Q_EMIT done(image);
+    }
+};
+
+class AvatarImageProvider : public AsyncImageProviderBase
+{
+public:
+    AvatarImageProvider(LRCInstance* instance = nullptr)
+        : AsyncImageProviderBase(instance)
+    {}
+
+    QQuickImageResponse* requestImageResponse(const QString& id, const QSize& requestedSize) override
+    {
+        auto response = new AsyncImageResponse<AsyncAvatarImageResponseRunnable>(id,
+                                                                                 requestedSize,
+                                                                                 &pool_,
+                                                                                 lrcInstance_);
+        return response;
     }
 };

src/app/avatarregistry.cpp

@@ -33,8 +33,7 @@ AvatarRegistry::AvatarRegistry(LRCInstance* instance, QObject* parent)
     connect(&lrcInstance_->accountModel(),
             &AccountModel::profileUpdated,
             this,
-            &AvatarRegistry::addOrUpdateImage,
-            Qt::UniqueConnection);
+            &AvatarRegistry::addOrUpdateImage);
 
     connect(lrcInstance_, &LRCInstance::base64SwarmAvatarChanged, this, [&] {
         addOrUpdateImage("temp");

src/app/avatarregistry.h

@@ -20,13 +20,22 @@
 
 #include <QObject>
 #include <QMap>
+#include <QQmlEngine>   // QML registration
+#include <QApplication> // QML registration
 
 class LRCInstance;
 
 class AvatarRegistry : public QObject
 {
     Q_OBJECT
+    QML_SINGLETON
+
 public:
+    static AvatarRegistry* create(QQmlEngine*, QJSEngine*)
+    {
+        return new AvatarRegistry(qApp->property("LRCInstance").value<LRCInstance*>());
+    }
+
     explicit AvatarRegistry(LRCInstance* instance, QObject* parent = nullptr);
     ~AvatarRegistry() = default;
 
@@ -34,7 +43,7 @@ public:
     Q_INVOKABLE QString getUid(const QString& id);
 
     // add or update a specific image in the cache
-    QString addOrUpdateImage(const QString& id);
+    Q_SLOT QString addOrUpdateImage(const QString& id);
 
 Q_SIGNALS:
     void avatarUidChanged(const QString& id);

src/app/bannedlistmodel.cpp

@@ -20,6 +20,9 @@
 #include "bannedlistmodel.h"
 
 #include "lrcinstance.h"
+#include "global.h"
+
+#include <api/contact.h>
 
 BannedListModel::BannedListModel(QObject* parent)
     : AbstractListModelBase(parent)
@@ -106,7 +109,13 @@ void
 BannedListModel::reset()
 {
     beginResetModel();
-    bannedlist_ = lrcInstance_->getCurrentAccountInfo().contactModel->getBannedContacts();
+    auto contactModel = lrcInstance_->getCurrentContactModel();
+    if (!contactModel) {
+        C_DBG << "Contact model is not available.";
+        bannedlist_.clear();
+    } else {
+        bannedlist_ = contactModel->getBannedContacts();
+    }
     endResetModel();
     set_count(rowCount());
 }

src/app/calladapter.cpp

@@ -26,8 +26,8 @@
 #include "calladapter.h"
 
 #include "systemtray.h"
-#include "qmlregister.h"
 #include "appsettingsmanager.h"
+#include "pttlistener.h"
 
 #include <api/callmodel.h>
 #include <api/callparticipantsmodel.h>
@@ -45,19 +45,15 @@ CallAdapter::CallAdapter(AppSettingsManager* settingsManager,
     : QmlAdapterBase(instance, parent)
     , systemTray_(systemTray)
     , callInformationListModel_(std::make_unique<CallInformationListModel>())
-    , listener_(new PTTListener(settingsManager, this))
 {
-    // Expose the Push-to-talk listener to QML as a singleton
-    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, listener_, "PttListener");
+    // Get the PTTListener instance.
+    listener_ = qApp->property("PTTListener").value<PTTListener*>();
 
     set_callInformationList(QVariant::fromValue(callInformationListModel_.get()));
 
     timer = new QTimer(this);
     connect(timer, &QTimer::timeout, this, &CallAdapter::updateAdvancedInformation);
 
-    overlayModel_.reset(new CallOverlayModel(lrcInstance_, listener_, this));
-    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, overlayModel_.get(), "CallOverlayModel");
-
     accountId_ = lrcInstance_->get_currentAccountId();
     connectCallModel(accountId_);
 
@@ -358,10 +354,11 @@ CallAdapter::onCallInfosChanged(const QString& accountId, const QString& callId)
 }
 
 void
-CallAdapter::onCallAddedToConference(const QString& callId, const QString& confId)
+CallAdapter::onCallAddedToConference(const QString& callId, const QString& conversationId, const QString& confId)
 {
     Q_UNUSED(callId)
     Q_UNUSED(confId)
+    Q_UNUSED(conversationId)
     saveConferenceSubcalls();
 }
 
@@ -393,16 +390,13 @@ CallAdapter::hangUpACall(const QString& accountId, const QString& convUid)
 }
 
 void
-CallAdapter::setCallMedia(const QString& accountId, const QString& convUid, bool video)
+CallAdapter::setCallMedia(const QString& accountId, const QString& convUid, bool videoMuted)
 {
     const auto& convInfo = lrcInstance_->getConversationFromConvUid(convUid, accountId);
     if (convInfo.uid.isEmpty())
         return;
-    try {
-        lrcInstance_->getAccountInfo(accountId).callModel->updateCallMediaList(convInfo.callId,
-                                                                               video);
-    } catch (...) {
-    }
+
+    lrcInstance_->getAccountInfo(accountId).callModel->setVideoMuted(convInfo.callId, videoMuted);
 }
 
 void

src/app/calladapter.h

@@ -23,32 +23,34 @@
 #include "lrcinstance.h"
 #include "qmladapterbase.h"
 #include "screensaver.h"
-#include "calloverlaymodel.h"
-
-#ifdef HAVE_GLOBAL_PTT
-#include "pttlistener.h"
-#endif
+#include "callInformationListModel.h"
 
 #include <QObject>
 #include <QString>
 #include <QVariant>
 #include <QSystemTrayIcon>
-
-#include "callInformationListModel.h"
+#include <QQmlEngine>   // QML registration
+#include <QApplication> // QML registration
 
 class SystemTray;
 class AppSettingsManager;
+class PTTListener;
 
 class CallAdapter final : public QmlAdapterBase
 {
     Q_OBJECT
+    QML_SINGLETON
+
     QML_PROPERTY(bool, hasCall)
     QML_RO_PROPERTY(QVariant, callInformationList)
 
 public:
-    QTimer* timer;
-    enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
-    Q_ENUM(MuteStates)
+    static CallAdapter* create(QQmlEngine*, QJSEngine*)
+    {
+        return new CallAdapter(qApp->property("AppSettingsManager").value<AppSettingsManager*>(),
+                               qApp->property("SystemTray").value<SystemTray*>(),
+                               qApp->property("LRCInstance").value<LRCInstance*>());
+    }
 
     explicit CallAdapter(AppSettingsManager* settingsManager,
                          SystemTray* systemTray,
@@ -56,13 +58,16 @@ public:
                          QObject* parent = nullptr);
     ~CallAdapter();
 
-public:
+    QTimer* timer;
+    enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
+    Q_ENUM(MuteStates)
+
     Q_INVOKABLE void startTimerInformation();
     Q_INVOKABLE void stopTimerInformation();
     Q_INVOKABLE void placeAudioOnlyCall();
     Q_INVOKABLE void placeCall();
     Q_INVOKABLE void hangUpACall(const QString& accountId, const QString& convUid);
-    Q_INVOKABLE void setCallMedia(const QString& accountId, const QString& convUid, bool video);
+    Q_INVOKABLE void setCallMedia(const QString& accountId, const QString& convUid, bool videoMuted);
     Q_INVOKABLE void acceptACall(const QString& accountId, const QString& convUid);
 
     Q_INVOKABLE void connectCallModel(const QString& accountId);
@@ -117,7 +122,7 @@ public Q_SLOTS:
     void onAccountChanged();
     void onCallStatusChanged(const QString& accountId, const QString& callId);
     void onCallStatusChanged(const QString& callId, int code);
-    void onCallAddedToConference(const QString& callId, const QString& confId);
+    void onCallAddedToConference(const QString& callId, const QString& conversationId, const QString& confId);
     void onCallStarted(const QString& callId);
     void onCallEnded(const QString& callId);
     void onCallInfosChanged(const QString& accountId, const QString& callId);
@@ -131,7 +136,6 @@ private:
 
     ScreenSaver screenSaver;
     SystemTray* systemTray_;
-    QScopedPointer<CallOverlayModel> overlayModel_;
     VectorString currentConfSubcalls_;
     std::unique_ptr<CallInformationListModel> callInformationListModel_;
 

src/app/calloverlaymodel.cpp

@@ -19,6 +19,8 @@
 
 #include "calloverlaymodel.h"
 
+#include "global.h"
+
 #include <QEvent>
 #include <QMouseEvent>
 #include <QQuickWindow>
@@ -360,23 +362,33 @@ CallOverlayModel::clearControls()
 }
 
 void
-CallOverlayModel::registerFilter(QQuickWindow* object, QQuickItem* item)
+CallOverlayModel::setEventFilterActive(QObject* object, QQuickItem* item, bool isActive)
 {
-    if (!object || !item || watchedItems_.contains(item))
+    QQuickWindow* window = qobject_cast<QQuickWindow*>(object);
+    if (!window || !item) {
+        C_WARN << "Attempting to" << (isActive ? "register" : "unregister")
+               << "an invalid object or item" << window << item;
         return;
-    watchedItems_.push_back(item);
-    if (watchedItems_.size() == 1)
-        object->installEventFilter(this);
-}
-
-void
-CallOverlayModel::unregisterFilter(QQuickWindow* object, QQuickItem* item)
-{
-    if (!object || !item || !watchedItems_.contains(item))
-        return;
-    watchedItems_.removeOne(item);
-    if (watchedItems_.size() == 0)
-        object->removeEventFilter(this);
+    }
+    if (isActive) {
+        if (watchedItems_.contains(item)) {
+            C_DBG << "Item already registered" << item;
+        } else {
+            watchedItems_.push_back(item);
+            if (watchedItems_.size() == 1) {
+                window->installEventFilter(this);
+            }
+        }
+    } else {
+        if (!watchedItems_.contains(item)) {
+            C_DBG << "Item not registered" << item;
+        } else {
+            watchedItems_.removeOne(item);
+            if (watchedItems_.size() == 0) {
+                window->removeEventFilter(this);
+            }
+        }
+    }
 }
 
 bool

src/app/calloverlaymodel.h

@@ -21,8 +21,6 @@
 
 #include "lrcinstance.h"
 #include "qtutils.h"
-#include "mainapplication.h"
-
 #include "pttlistener.h"
 
 #include <QAbstractListModel>
@@ -139,8 +137,7 @@ public:
     Q_INVOKABLE QVariant overflowHiddenModel();
     Q_INVOKABLE QVariant pendingConferenceesModel();
 
-    Q_INVOKABLE void registerFilter(QQuickWindow* object, QQuickItem* item);
-    Q_INVOKABLE void unregisterFilter(QQuickWindow* object, QQuickItem* item);
+    Q_INVOKABLE void setEventFilterActive(QObject* object, QQuickItem* item, bool isActive);
     bool eventFilter(QObject* object, QEvent* event) override;
 
 Q_SIGNALS:

src/app/commoncomponents/BackButton.qml

@@ -42,4 +42,6 @@ PushButton {
             keyEvent.accepted = true;
         }
     }
+
+    QWKSetParentHitTestVisible {}
 }

src/app/commoncomponents/BaseView.qml

@@ -35,10 +35,12 @@ Rectangle {
     signal dismissed
 
     Component.onCompleted: {
+        console.debug("Created", objectName);
         if (managed)
             presented();
     }
     Component.onDestruction: {
+        console.debug("Destroyed", objectName);
         if (managed)
             dismissed();
     }

src/app/commoncomponents/CallMessageDelegate.qml

@@ -18,6 +18,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
 import net.jami.Models 1.1
 import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
@@ -25,8 +26,10 @@ import net.jami.Constants 1.1
 SBSMessageBase {
     id: root
 
+    property var confId: ConfId
+    property var currentCallId: CurrentCall.id
     component JoinCallButton: MaterialButton {
-        visible: root.isActive
+        visible: root.isActive && root.currentCallId !== root.confId
         toolTipText: JamiStrings.joinCall
         color: JamiTheme.blackColor
         background.opacity: hovered ? 0.2 : 0.1
@@ -47,13 +50,15 @@ SBSMessageBase {
 
     bubble.border.color: CurrentConversation.color
     bubble.border.width: root.isActive ? 1.5 : 0
+    bubble.color: JamiTheme.messageInBgColor
+    bubble.opacity: 0.6
 
     Connections {
         target: CurrentConversation
         enabled: root.isActive
 
         function onActiveCallsChanged() {
-            root.isActive = LRCInstance.indexOfActiveCall(ConfId, ActionUri, DeviceId) !== -1;
+            root.isActive = LRCInstance.indexOfActiveCall(root.confId, ActionUri, DeviceId) !== -1;
             if (root.isActive) {
                 bubble.mask.border.color = CurrentConversation.color;
                 bubble.mask.border.width = 1.5;
@@ -62,10 +67,10 @@ SBSMessageBase {
         }
     }
 
-    property bool isActive: LRCInstance.indexOfActiveCall(ConfId, ActionUri, DeviceId) !== -1
-    visible: isActive || ConfId === "" || Duration > 0
+    property bool isActive: LRCInstance.indexOfActiveCall(root.confId, ActionUri, DeviceId) !== -1
+    visible: isActive || root.confId === "" || Duration > 0
 
-    property var baseColor: isOutgoing? CurrentConversation.color : JamiTheme.messageInBgColor
+    property var baseColor: JamiTheme.messageInBgColor
 
     innerContent.children: [
         RowLayout {
@@ -74,22 +79,60 @@ SBSMessageBase {
             spacing: 10
             visible: root.visible
 
-            Label {
-                id: callLabel
+            Image {
+                id: statusIcon
+                Layout.leftMargin: 8
+                width: 10
+                height: 10
+                verticalAlignment: Qt.AlignVCenter
+                visible: !root.isActive
+
+                source: {
+                    if (root.isOutgoing) {
+                        if (Duration > 0)
+                            return "qrc:/icons/outgoing-call.svg";
+                        else
+                            return "qrc:/icons/missed-outgoing-call.svg";
+                    } else {
+                        if (Duration > 0)
+                            return "qrc:/icons/incoming-call.svg";
+                        else
+                            return "qrc:/icons/missed-incoming-call.svg";
+                    }
+                }
+                layer {
+                    enabled: true
+                    effect: ColorOverlay {
+                        color: {
+                            if (Duration > 0)
+                                return UtilsAdapter.luma(root.baseColor) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark
+                            return JamiTheme.redColor
+                        }
+                    }
+                }
+
+            }
+
+            TextEdit {
+                id: callLabel
+                objectName: "callLabel"
+
+                topPadding: 8
+                bottomPadding: 8
 
-                Layout.margins: 8
                 Layout.fillWidth: true
-                Layout.rightMargin: root.isActive ? 0 : root.timeWidth + 16
-                Layout.leftMargin: root.isActive ? 10 : 8
+                Layout.rightMargin: root.isActive && root.currentCallId !== root.confId ? 0 : root.timeWidth + 16
+                Layout.leftMargin: root.isActive ? 10 : -5 /* spacing is 10 and we want 5px with icon */
 
                 text: {
                     if (root.isActive)
                         return JamiStrings.startedACall;
                     return Body;
                 }
+                verticalAlignment: Qt.AlignVCenter
                 horizontalAlignment: Qt.AlignHCenter
 
-                font.pointSize: JamiTheme.mediumFontSize
+                font.pointSize: JamiTheme.smallFontSize
                 font.hintingPreference: Font.PreferNoHinting
                 renderType: Text.NativeRendering
                 textFormat: Text.MarkdownText
@@ -99,20 +142,22 @@ SBSMessageBase {
 
             JoinCallButton {
                 id: joinCallInAudio
+                objectName: "joinCallInAudio"
                 Layout.topMargin: 4
                 Layout.bottomMargin: 4
 
                 text: JamiStrings.joinInAudio
-                onClicked: MessagesAdapter.joinCall(ActionUri, DeviceId, ConfId, true)
+                onClicked: MessagesAdapter.joinCall(ActionUri, DeviceId, root.confId, true)
             }
 
             JoinCallButton {
                 id: joinCallInVideo
+                objectName: "joinCallInVideo"
                 text: JamiStrings.joinInVideo
                 Layout.topMargin: 4
                 Layout.bottomMargin: 4
 
-                onClicked: MessagesAdapter.joinCall(ActionUri, DeviceId, ConfId)
+                onClicked: MessagesAdapter.joinCall(ActionUri, DeviceId, root.confId)
                 Layout.rightMargin: 4
             }
         }
@@ -125,7 +170,7 @@ SBSMessageBase {
         }
     }
     Component.onCompleted: {
-        bubble.timestampItem.visible = !root.isActive;
+        bubble.timestampItem.visible = !root.isActive || root.currentCallId === root.confId;
         opacity = 1;
     }
 }