misc: bump daemon

Change-Id: I6ef2de4167439c6597dd9c9f6532c6763aeaa2df

.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

@@ -1,11 +1,4 @@
-# Copyright (C) 2020-2024 Savoir-faire Linux Inc.
-#
-# Author: Albert Babí <albert.babi@savoirfairelinux.com>
-# Author: Amin Bandali <amin.bandali@savoirfairelinux.com>
-# Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
-# Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
-# Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
-# Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
+# Copyright (C) 2020-2025 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
@@ -29,13 +22,12 @@ else()
   project(jami)
 endif()
 
+set(CMAKE_SCRIPTS_DIR ${PROJECT_SOURCE_DIR}/extras/build/cmake)
+include(${CMAKE_SCRIPTS_DIR}/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 +43,14 @@ if(ENABLE_ASAN AND NOT MSVC)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
 endif()
 
+# Enable this option when building for production.
+option(ENABLE_CRASHREPORTS "Enable crash reports" OFF)
+
+# 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)
+define_macro_with_value(ENABLE_CRASHREPORTS)
+
 # jami-core
 if(NOT WITH_DAEMON_SUBMODULE)
   set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
@@ -69,12 +69,6 @@ set(CLIENT_INCLUDE_DIRS, "")
 set(CLIENT_LINK_DIRS, "")
 set(CLIENT_LIBS, "")
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-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)
 
@@ -85,13 +79,24 @@ list(APPEND QWINDOWKIT_OPTIONS
 )
 
 if(WIN32)
-  list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0002-workaround-right-margin.patch)
+  # Beta config
+  if(BETA)
+    message(STATUS "Beta config enabled")
+    add_definitions(-DBETA)
+    set(JAMI_OUTPUT_DIRECTORY_RELEASE ${PROJECT_SOURCE_DIR}/x64/Beta)
+  else()
+    set(JAMI_OUTPUT_DIRECTORY_RELEASE ${PROJECT_SOURCE_DIR}/x64/Release)
+  endif()
+endif()
+
+if(WIN32)
   list(APPEND QWINDOWKIT_OPTIONS QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDERS OFF)
 endif()
 
-# qmsetup uses the wrong package dir on Fedora at least.
-check_redhat_based(IS_REDHAT_BASED)
-if(IS_REDHAT_BASED)
+# 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()
@@ -107,6 +112,44 @@ add_fetch_content(
 list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
 list(APPEND CLIENT_LIBS QWindowKit::Quick)
 
+# If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.
+if(ENABLE_CRASHREPORTS)
+  set(ENABLE_CRASHPAD ON)
+  set(CRASH_REPORT_URL "http://localhost:8080/submit" CACHE STRING "URL for crash handler uploads")
+endif()
+add_definitions(-DCRASH_REPORT_URL="${CRASH_REPORT_URL}")
+
+# Crash-report client: crashpad
+if(ENABLE_CRASHPAD)
+  message(STATUS "Crashpad enabled for client")
+  if(WIN32)
+    set(CMAKE_OBJECT_PATH_MAX 256)
+    add_definitions(-DNOMINMAX)
+  endif()
+  add_fetch_content(
+    TARGET crashpad_cmake
+    URL https://github.com/TheAssemblyArmada/crashpad-cmake.git
+    BRANCH 80573adcc845071401c73c99eaec7fd9847d45fb
+  )
+  add_definitions(-DENABLE_CRASHPAD)
+  if (WIN32)
+    # This makes sure the console window doesn't show up when running the
+    # crashpad_handler executable.
+    set_target_properties(crashpad_handler PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
+    # Set the output directory for the crashpad_handler executable. On Windows,
+    # we use either the Release or Beta directory depending on the BETA option
+    # which is set above.
+    set_target_properties(crashpad_handler PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY_RELEASE "${JAMI_OUTPUT_DIRECTORY_RELEASE}")
+  endif()
+endif()
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(NOT MSVC)
+  set(CMAKE_CXX_FLAGS_DEBUG "-Og -ggdb")
+endif()
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
@@ -115,6 +158,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # src
 set(LIBCLIENT_SRC_DIR ${PROJECT_SOURCE_DIR}/src/libclient)
 set(APP_SRC_DIR ${PROJECT_SOURCE_DIR}/src/app)
+set(VERSION_INFO_DIR ${PROJECT_SOURCE_DIR}/src/version_info)
 # doc
 set(DOC_DIR ${PROJECT_SOURCE_DIR}/doc)
 # extras
@@ -128,7 +172,7 @@ 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)
@@ -137,10 +181,15 @@ else()
   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
@@ -203,11 +252,28 @@ include(FindPython3)
 find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
 set(PYTHON_EXEC ${Python3_EXECUTABLE})
 
+# Versioning and build ID generation
+set(VERSION_FILE ${CMAKE_CURRENT_BINARY_DIR}/version_info.cpp)
+# Touch the file to make sure it exists at configure time as
+# we add it to the target_sources below.
+file(TOUCH ${VERSION_FILE})
+add_custom_target(
+  generate_version_info ALL
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMAND ${CMAKE_COMMAND}
+  -DAPP_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+  -DAPP_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
+  -DCORE_SOURCE_DIR=${DAEMON_DIR}
+  -DCPP_INT_FILE=${VERSION_INFO_DIR}/version_info.cpp.in
+  -P ${CMAKE_SCRIPTS_DIR}/generate_version_info.cmake
+)
+list(APPEND CLIENT_INCLUDE_DIRS ${VERSION_INFO_DIR})
+
 # Resource auto-gen
 # QML and related code files
 # Check files in the app's src directory and force a reconfigure if it
 # changes.
-# Only include webengine resources if specified.
+# Only include WebEngine resources if specified.
 if(WITH_WEBENGINE)
   set(GEN_QRC_ARGS "--with-webengine")
 endif()
@@ -219,6 +285,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
@@ -230,10 +297,16 @@ 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)
 
 set(COMMON_SOURCES
+  ${VERSION_FILE}
   ${APP_SRC_DIR}/bannedlistmodel.cpp
   ${APP_SRC_DIR}/accountlistmodel.cpp
   ${APP_SRC_DIR}/networkmanager.cpp
@@ -290,9 +363,11 @@ set(COMMON_SOURCES
   ${APP_SRC_DIR}/imagedownloader.cpp
   ${APP_SRC_DIR}/pluginversionmanager.cpp
   ${APP_SRC_DIR}/connectioninfolistmodel.cpp
-  ${APP_SRC_DIR}/pluginversionmanager.cpp)
+  ${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
@@ -358,7 +433,10 @@ set(COMMON_HEADERS
   ${APP_SRC_DIR}/imagedownloader.h
   ${APP_SRC_DIR}/pluginversionmanager.h
   ${APP_SRC_DIR}/connectioninfolistmodel.h
-  ${APP_SRC_DIR}/pttlistener.h)
+  ${APP_SRC_DIR}/pttlistener.h
+  ${APP_SRC_DIR}/crashreportclient.h
+  ${APP_SRC_DIR}/crashreporter.h
+)
 
 # For libavutil/avframe.
 set(LIBJAMI_CONTRIB_DIR "${DAEMON_DIR}/contrib")
@@ -377,6 +455,15 @@ endif()
 # Define PREFER_VULKAN to prefer Vulkan over the default API
 # on GNU/Linux and Windows. Metal is always preferred on macOS.
 
+if(ENABLE_CRASHREPORTS)
+  set(CRASHREPORT_CLIENT_DIR ${APP_SRC_DIR}/crashreportclients)
+  if(ENABLE_CRASHPAD)
+    list(APPEND CLIENT_LIBS crashpad_client)
+    list(APPEND COMMON_SOURCES ${CRASHREPORT_CLIENT_DIR}/crashpad.cpp)
+    list(APPEND COMMON_HEADERS ${CRASHREPORT_CLIENT_DIR}/crashpad.h)
+  endif()
+endif()
+
 if(MSVC)
   set(WINDOWS_SYS_LIBS
     windowsapp.lib
@@ -422,16 +509,6 @@ if(MSVC)
   set(JAMID_SRC_PATH ${DAEMON_DIR}/contrib/msvc/include)
   set(GNUTLS_LIB ${DAEMON_DIR}/contrib/msvc/lib/x64/libgnutls.lib)
 
-  # Beta config
-  if(BETA)
-    message(STATUS "Beta config enabled")
-    add_definitions(-DBETA)
-    set(JAMI_OUTPUT_DIRECTORY_RELEASE ${PROJECT_SOURCE_DIR}/x64/Beta)
-  else()
-    set(JAMI_OUTPUT_DIRECTORY_RELEASE
-      ${PROJECT_SOURCE_DIR}/x64/Release)
-  endif()
-
   include_directories(
     ${JAMID_SRC_PATH}
     ${LIBCLIENT_SRC_DIR}
@@ -441,10 +518,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)
@@ -459,6 +538,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)
@@ -570,6 +654,7 @@ include_directories(
 if(ENABLE_LIBWRAP)
   list(APPEND COMMON_HEADERS
     ${LIBCLIENT_SRC_DIR}/qtwrapper/instancemanager_wrap.h)
+  add_definitions(-DENABLE_LIBWRAP=true)
 endif()
 
 # SFPM
@@ -578,6 +663,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)
@@ -603,6 +689,9 @@ qt_add_executable(
   ${QML_RESOURCES_QML}
   ${SFPM_OBJECTS})
 
+# Make sure we can find the generated version file
+add_dependencies(${PROJECT_NAME} generate_version_info)
+
 foreach(MODULE ${QT_MODULES})
   list(APPEND QT_LIBS "Qt::${MODULE}")
 endforeach()
@@ -669,13 +758,13 @@ elseif (NOT APPLE)
   # Install .desktop in XDG desktop direcory so that it is recognized
   # by the system.
   install(
-    FILES ${DATA_DIR}/jami.desktop
+    FILES ${DATA_DIR}/net.jami.Jami.desktop
     DESTINATION ${JAMI_DATA_PREFIX}/applications)
 
   # Install .desktop in the jami data directory, so that it can be
   # copied to the autostart directory by the client.
   install(
-    FILES ${DATA_DIR}/jami.desktop
+    FILES ${DATA_DIR}/net.jami.Jami.desktop
     DESTINATION "${JAMI_DATA_PREFIX}/${PROJECT_NAME}"
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) # 644
 
@@ -710,9 +799,19 @@ elseif (NOT APPLE)
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
     RENAME jami.xpm)
 
+  # AppStream metadata
+  #
+  # MetaInfo file:
   install(
-    FILES ${DATA_DIR}/jami.appdata.xml
+    FILES ${DATA_DIR}/net.jami.Jami.metainfo.xml
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+  # Catalog file:
+  if(NOT DEFINED APPSTREAM_CATALOG_DIR)
+    set(APPSTREAM_CATALOG_DIR /share/swcatalog/xml)
+  endif()
+  install(
+    FILES ${DATA_DIR}/jami.xml
+    DESTINATION ${CMAKE_INSTALL_PREFIX}${APPSTREAM_CATALOG_DIR})
 
   # man page
   install(
@@ -796,12 +895,20 @@ else()
     "-framework Security"
       compression
       resolv
-    )
+  )
+
+  set(APP_CONTAINER "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app/Contents")
+
+  # ringtones. Copy the entire directory to the app bundle.
+  # daemon/ringtones -> Jami.app/Contents/Resources/ringtones
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    ${DAEMON_DIR}/ringtones
+    ${APP_CONTAINER}/Resources/ringtones
+  )
 
   # translations
   if(Qt${QT_VERSION_MAJOR}LinguistTools_FOUND)
-    set(APP_CONTAINER
-      "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app/Contents")
     file(GLOB TS_FILES ${PROJECT_SOURCE_DIR}/translations/*.ts)
 
     # Generate lproj folders.
@@ -829,27 +936,26 @@ else()
           MACOSX_BUNDLE_SHORT_VERSION_STRING "${JAMI_VERSION}"
           MACOSX_BUNDLE_BUNDLE_VERSION "${JAMI_BUILD}"
           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()
-          set_target_properties(${PROJECT_NAME} PROPERTIES
-                SPARKLE_URL "${SPARKLE_URL}"
-                SPARKLE_PUBLIC_KEY "${SPARKLE_PUBLIC_KEY}"
-                XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/Jami.entitlements"
-                XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE)
-      endif()
-      if(DEPLOY)
-          add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-                             COMMAND ${CMAKE_COMMAND} -DQML_SRC_DIR=${SRC_DIR}
-                             -DMAC_DEPLOY_QT_PATH=${CMAKE_PREFIX_PATH}/bin
-                             -DEXE_NAME="${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app"
-                             -DSPARKLE_PATH=${SPARKLE_FRAMEWORK}
-                             -DENABLE_SPARKLE=${ENABLE_SPARKLE}
-                             -P ${EXTRAS_DIR}/build/cmake/macos_qt_deploy.cmake)
-      endif()
+  if(APPSTORE)
+    message(STATUS "app store version")
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+          XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/appstore/Jami.entitlements")
+  else()
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+          SPARKLE_URL "${SPARKLE_URL}"
+          SPARKLE_PUBLIC_KEY "${SPARKLE_PUBLIC_KEY}"
+          XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/Jami.entitlements"
+          XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE)
+  endif()
+  if(DEPLOY)
+    execute_process(COMMAND
+      "${CMAKE_PREFIX_PATH}/bin/macdeployqt"
+      "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app"
+      -qmldir=${QML_SRC_DIR})
+    if(${ENABLE_SPARKLE} MATCHES true)
+      file(COPY ${SPARKLE_FRAMEWORK} DESTINATION ${EXE_NAME}/Contents/Frameworks/)
+    endif()
+  endif()
 endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CLIENT_INCLUDE_DIRS})
@@ -860,7 +966,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,14 +7,14 @@ 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)
 
 If your distribution is supported, we provide a Qt package (libqt-jami) on our repo.
-The files will be installed in `/usr/lib/libqt-jami`.
+The files will be installed to `/usr/lib/libqt-jami` on Debian-like distributions. For RPM based distributions the files will be installed to `/usr/lib64/qt-jami`.
 
 #### Install libqt-jami, Ubuntu based
 
@@ -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).
 
@@ -113,12 +113,12 @@ sudo ./build.py --dependencies
 Then, you can build daemon and the client using:
 
 ```bash
-./build.py --install
+./build.py --install [--qt=<path/to/qt> (this needs to be the same as in the previous ./build.py --init)]
 ```
 
 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
@@ -338,9 +343,24 @@ Built client could be find in `build/Jami`
 
 - These environment variables will be temporarily set when using build-windows.py to run tests.
 
+## Troubleshooting
+
+Build errors may occur if daemon dependencies have been updated since the last build, as the script may not fully detect or rebuild them in the correct order. For the same reason, you may also occasionally encounter linker errors.
+
+To resolve this, clean and restart the installation to ensure a fresh rebuild of all components (delete all temporary files generated by the build process):
+
+```bash
+./build.py --clean
+./build.py --install
+```
+
 ## Debugging
 
-Compile the client with with `-DCMAKE_BUILD_TYPE=Debug`.
+Compile the client with `-DCMAKE_BUILD_TYPE=Debug`. Then, if you want to enable logging when running `jami`, launch it with `-d` or `--debug`.
 
-Then, if you want to enable logging when running `jami`, launch it
-with `-d` or `--debug`.
+To diagnose a crash, use GDB:
+
+```sh
+./build.py --install --debug
+gdb -ex run --args ./jami --debug
+```

JamiInstaller/.gitignore

@@ -1,3 +1,4 @@
 /obj
 /bin
-Components.wxs
+AppComponents.wxs
+CrtComponents.wxs

JamiInstaller/Config.wxi

@@ -3,13 +3,11 @@
     <?define Name="Jami" ?>
     <?define ExeName="Jami" ?>
     <?define AppName="Jami" ?>
+    <?define Manufacturer="Savoir-Faire Linux"?>
 
     <?if $(var.Configuration) = Release ?>
     <?define ReleaseDir="..\x64\Release"?>
     <?else?>
     <?define ReleaseDir="..\x64\Beta"?>
     <?endif ?>
-
-    <?define Manufacturer="Savoir-Faire Linux"?>
-    <?define UcrtDir="C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64"?>
 </Include>

JamiInstaller/JamiInstaller.wax

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-16"?>
-<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <DeployedProjects />
   <DirectoryMappings />
   <FileMappings />

JamiInstaller/JamiInstaller.wixproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0"
+  DefaultTargets="Build"
+  InitialTargets="EnsureWixToolsetInstalled"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -16,7 +19,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>HarvestPath=..\x64\Release</DefineConstants>
+    <DefineConstants>AppHarvestPath=..\x64\Release;CrtHarvestPath=$(VC_CRT_Dir)</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
     <CompilerAdditionalOptions>
     </CompilerAdditionalOptions>
@@ -26,7 +29,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Beta|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>HarvestPath=..\x64\Beta</DefineConstants>
+    <DefineConstants>AppHarvestPath=..\x64\Beta;CrtHarvestPath=$(VC_CRT_Dir)</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
     <CompilerAdditionalOptions>
     </CompilerAdditionalOptions>
@@ -35,8 +38,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
-    <Compile Include="StandardComponents.wxs" />
-    <Compile Include="Components.wxs" />
+    <Compile Include="AppComponents.wxs" />
+    <Compile Include="CrtComponents.wxs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config.wxi" />
@@ -58,13 +61,36 @@
   <ItemGroup>
     <EmbeddedResource Include="Localization.wxl" />
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+  <Import Project="$(WixTargetsPath)"
+    Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets"
+    Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled"
+    Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\x64\$(Configuration)" PreprocessorVariable="var.HarvestPath" OutputFile="Components.wxs" ComponentGroupName="HeatGenerated" DirectoryRefId="APPLICATIONFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" Transforms="HarvestFilter.xslt" />
+    <HeatDirectory Directory="..\x64\$(Configuration)"
+      PreprocessorVariable="var.AppHarvestPath"
+      OutputFile="AppComponents.wxs"
+      ComponentGroupName="AppHeatGenerated"
+      DirectoryRefId="APPLICATIONFOLDER"
+      AutogenerateGuids="true"
+      ToolPath="$(WixToolPath)"
+      SuppressFragments="true"
+      SuppressRegistry="true"
+      SuppressRootDirectory="true"
+      Transforms="HarvestFilter.xslt" />
+    <HeatDirectory Directory="$(VC_CRT_Dir)"
+      PreprocessorVariable="var.CrtHarvestPath"
+      OutputFile="CrtComponents.wxs"
+      ComponentGroupName="CrtHeatGenerated"
+      DirectoryRefId="APPLICATIONFOLDER"
+      AutogenerateGuids="true"
+      ToolPath="$(WixToolPath)"
+      SuppressFragments="true"
+      SuppressRegistry="true"
+      SuppressRootDirectory="true" />
   </Target>
   <Target Name="AfterBuild">
   </Target>

JamiInstaller/Localization.wxl

@@ -2,6 +2,14 @@
 <WixLocalization Culture="en-us"
     xmlns="http://schemas.microsoft.com/wix/2006/localization">
     <String Id="AdvancedWelcomeEulaDlgDescriptionPerMachine">By installing this software you agree to the terms in the license agreement</String>
-    <UI Dialog="ExitDialog" Control="OptionalCheckBox" Width="10" Height="10" X="135" Y="110" />
-    <UI Dialog="ExitDialog" Control="OptionalText" X="150" Y="110" />
+    <UI Dialog="ExitDialog"
+        Control="OptionalCheckBox"
+        Width="10"
+        Height="10"
+        X="135"
+        Y="110" />
+    <UI Dialog="ExitDialog"
+        Control="OptionalText"
+        X="150"
+        Y="110" />
 </WixLocalization>

JamiInstaller/Product.wxs

@@ -1,134 +1,220 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?include Config.wxi?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="$(var.Name)" Language="1033" Version="$(fun.AutoVersion(1.0))" Manufacturer="$(var.Manufacturer)" UpgradeCode="7c45b52b-0390-4fe8-947a-3f13e82dd346">
-    <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" />
+  <Product Id="*"
+    Name="$(var.Name)"
+    Language="1033"
+    Version="$(fun.AutoVersion(1.0))"
+    Manufacturer="$(var.Manufacturer)"
+    UpgradeCode="7c45b52b-0390-4fe8-947a-3f13e82dd346">
+    <Package InstallerVersion="301"
+      Compressed="yes"
+      InstallScope="perMachine" />
 
-    <MajorUpgrade Schedule="afterInstallInitialize" AllowDowngrades="yes"/>
-    <MediaTemplate EmbedCab="yes" CompressionLevel="high" MaximumUncompressedMediaSize="4" />
+    <MajorUpgrade Schedule="afterInstallInitialize"
+      AllowDowngrades="yes"/>
+    <MediaTemplate EmbedCab="yes"
+      CompressionLevel="high"
+      MaximumUncompressedMediaSize="4" />
 
     <!--Disables interaction of the package with the Restart Manager.-->
-    <Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" />
+    <Property Id="MSIRESTARTMANAGERCONTROL"
+      Value="Disable" />
 
     <!--Icon File should be in release folder(not wix project), otherwise cannot be read-->
-    <Icon Id="icon.ico" SourceFile="$(var.ReleaseDir)\jami.ico" />
-    <Property Id="ARPPRODUCTICON" Value="icon.ico" />
-    <Property Id="ARPNOMODIFY" Value="1" />
+    <Icon Id="icon.ico"
+      SourceFile="$(var.ReleaseDir)\jami.ico" />
+    <Property Id="ARPPRODUCTICON"
+      Value="icon.ico" />
+    <Property Id="ARPNOMODIFY"
+      Value="1" />
 
     <!-- It seems that QtWebEngineProcess.exe versioning requires us to force reinstall. -->
-    <Property Id="REINSTALLMODE" Value="dms" />
+    <Property Id="REINSTALLMODE"
+      Value="dms" />
 
-    <Feature Id="ProductFeature" Title="Main" Level="1" Absent="disallow">
-      <ComponentGroupRef Id="StandardComponents" Primary="yes" />
-      <ComponentGroupRef Id="HeatGenerated" />
+    <Feature Id="ProductFeature"
+      Title="Main"
+      Level="1"
+      Absent="disallow">
+      <ComponentGroupRef Id="MainExecutable"
+        Primary="yes" />
+      <ComponentGroupRef Id="AppHeatGenerated" />
+      <ComponentGroupRef Id="CrtHeatGenerated" />
       <ComponentRef Id="ApplicationShortcutDesktop" />
       <ComponentRef Id="ApplicationShortcutStartMenu" />
       <ComponentRef Id="RegistryEntries" />
       <ComponentRef Id="URLProtocolRegistryEntries" />
     </Feature>
 
-    <!--Visual C++ Redist merge module-->
-    <DirectoryRef Id="TARGETDIR">
-      <Merge Id="VCRedist" SourceFile="$(env.VCRedistMergeModule)" DiskId="1" Language="0" />
-    </DirectoryRef>
-    <Feature Id="VCRedist" Title="Visual C++ Runtime" AllowAdvertise="no" Display="hidden" Level="1">
-      <MergeRef Id="VCRedist"/>
-    </Feature>
-
-    <SetProperty After="FindRelatedProducts" Id="FirstInstall" Value="true">
+    <SetProperty After="FindRelatedProducts"
+      Id="FirstInstall"
+      Value="true">
       NOT Installed AND NOT WIX_UPGRADE_DETECTED AND NOT WIX_DOWNGRADE_DETECTED
     </SetProperty>
-    <SetProperty After="SetFirstInstall" Id="Upgrading" Value="true">
+    <SetProperty After="SetFirstInstall"
+      Id="Upgrading"
+      Value="true">
       WIX_UPGRADE_DETECTED AND NOT (REMOVE="ALL")
     </SetProperty>
-    <SetProperty After="RemoveExistingProducts" Id="RemovingForUpgrade" Sequence="execute" Value="true">
-      (REMOVE="ALL") AND UPGRADINGPRODUCTCODE
+    <SetProperty After="RemoveExistingProducts"
+      Id="RemovingForUpgrade"
+      Sequence="execute"
+      Value="true"> (REMOVE="ALL") AND UPGRADINGPRODUCTCODE
     </SetProperty>
-    <SetProperty After="SetUpgrading" Id="Uninstalling" Value="true">
+    <SetProperty After="SetUpgrading"
+      Id="Uninstalling"
+      Value="true">
       Installed AND (REMOVE="ALL") AND NOT (WIX_UPGRADE_DETECTED OR UPGRADINGPRODUCTCODE)
     </SetProperty>
-    <SetProperty After="SetUninstalling" Id="Maintenance" Value="true">
+    <SetProperty After="SetUninstalling"
+      Id="Maintenance"
+      Value="true">
       Installed AND NOT Upgrading AND NOT Uninstalling AND NOT UPGRADINGPRODUCTCODE
     </SetProperty>
 
     <!--SetDirectory of APPLICATIONFOLDER -->
-    <SetDirectory Id="APPLICATIONFOLDER" Value="[ProgramFiles64Folder][ApplicationFolderName]">APPLICATIONFOLDER=""</SetDirectory>
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[APPLICATIONFOLDER]" After="CostFinalize" />
+    <SetDirectory Id="APPLICATIONFOLDER"
+      Value="[ProgramFiles64Folder][ApplicationFolderName]">APPLICATIONFOLDER=""</SetDirectory>
+    <SetProperty Id="ARPINSTALLLOCATION"
+      Value="[APPLICATIONFOLDER]"
+      After="CostFinalize" />
 
     <UIRef Id="CustomUI" />
-    <WixVariable Id="WixUIInfoIcon" Value="icon.ico"/>
-    <WixVariable Id="WixUIBannerBmp" Value="top-banner.bmp" />
-    <WixVariable Id="WixUIDialogBmp" Value="main-banner.bmp" />
-    <WixVariable Id="WixUISupportPerUser" Value="0" />
+    <WixVariable Id="WixUIInfoIcon"
+      Value="icon.ico"/>
+    <WixVariable Id="WixUIBannerBmp"
+      Value="top-banner.bmp" />
+    <WixVariable Id="WixUIDialogBmp"
+      Value="main-banner.bmp" />
+    <WixVariable Id="WixUISupportPerUser"
+      Value="0" />
 
     <CustomAction Id="RemoveOldJamiFiles"
-                  Directory="APPLICATIONFOLDER"
-                  ExeCommand="cmd /c &quot;del vc_redist.x64.exe; del uninstall.exe; del WinSparkle.dll;&quot;"
-                  Execute="deferred"
-                  Return="ignore"
-                  HideTarget="no"
-                  Impersonate="no"/>
+      Directory="APPLICATIONFOLDER"
+      ExeCommand="cmd /c &quot;del vc_redist.x64.exe; del uninstall.exe; del WinSparkle.dll;&quot;"
+      Execute="deferred"
+      Return="ignore"
+      HideTarget="no"
+      Impersonate="no"/>
 
     <Property Id="QtExecCmdLine"
-              Value='"[APPLICATIONFOLDER]/$(var.ExeName).exe" --term'/>
+      Value='"[APPLICATIONFOLDER]/$(var.ExeName).exe" --term'/>
     <CustomAction Id="TerminateAppProcess"
-                  BinaryKey="WixCA"
-                  DllEntry="CAQuietExec"
-                  Execute="immediate"
-                  Return="ignore"/>
+      BinaryKey="WixCA"
+      DllEntry="CAQuietExec"
+      Execute="immediate"
+      Return="ignore"/>
   </Product>
 
   <Fragment Id="DirectoryStructure">
-    <Directory Id="TARGETDIR" Name="SourceDir">
+    <Directory Id="TARGETDIR"
+      Name="SourceDir">
       <Directory Id="ProgramFiles64Folder">
-        <Directory Id="APPLICATIONFOLDER" Name="$(var.Name)" />
+        <Directory Id="APPLICATIONFOLDER"
+          Name="$(var.Name)" />
       </Directory>
-      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="DesktopFolder"
+        Name="Desktop" />
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" />
       </Directory>
-      <Directory Id="WindowsFolder" Name="WINDOWS"/>
+      <Directory Id="WindowsFolder"
+        Name="WINDOWS"/>
     </Directory>
   </Fragment>
 
+  <Fragment>
+    <ComponentGroup Id="MainExecutable"
+      Directory="APPLICATIONFOLDER">
+      <Component Id="cmp9CFEE34E3A162AB05264E8B756EC1DEC"
+        Guid="*">
+        <File Id="fileMain.exe"
+          KeyPath="yes"
+          Source="$(var.ReleaseDir)\$(var.ExeName).exe" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+
   <Fragment Id="Shortcuts">
     <DirectoryRef Id="DesktopFolder">
-      <Component Id="ApplicationShortcutDesktop" Guid="*" Win64="yes">
-        <Shortcut Id="ApplicationShortcutDesktop" Name="$(var.Name)" Description="Launch $(var.Name)" Target="[#fileMain.exe]" WorkingDirectory="INSTALLFOLDER" />
-        <RemoveFolder Id="DesktopFolder" On="uninstall" />
-        <RegistryValue Root="HKCU" Key="Software\jami.net\$(var.Name)" Name="desktop" Type="integer" Value="1" KeyPath="yes" />
+      <Component Id="ApplicationShortcutDesktop"
+        Guid="*"
+        Win64="yes">
+        <Shortcut Id="ApplicationShortcutDesktop"
+          Name="$(var.Name)"
+          Description="Launch $(var.Name)"
+          Target="[#fileMain.exe]"
+          WorkingDirectory="INSTALLFOLDER" />
+        <RemoveFolder Id="DesktopFolder"
+          On="uninstall" />
+        <RegistryValue Root="HKCU"
+          Key="Software\jami.net\$(var.Name)"
+          Name="desktop"
+          Type="integer"
+          Value="1"
+          KeyPath="yes" />
         <Condition>FirstInstall</Condition>
       </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="ApplicationProgramsFolder">
-      <Component Id="ApplicationShortcutStartMenu" Guid="*" Win64="yes">
-        <Shortcut Id="ApplicationShortcutStartMenu" Name="$(var.Name)" Description="Launch $(var.Name)" Target="[#fileMain.exe]" WorkingDirectory="INSTALLFOLDER" />
-        <RemoveFolder Id="StartMenuFolder" On="uninstall" />
-        <RegistryValue Root="HKCU" Key="Software\jami.net\$(var.Name)" Name="startmenu" Type="integer" Value="1" KeyPath="yes" />
+      <Component Id="ApplicationShortcutStartMenu"
+        Guid="*"
+        Win64="yes">
+        <Shortcut Id="ApplicationShortcutStartMenu"
+          Name="$(var.Name)"
+          Description="Launch $(var.Name)"
+          Target="[#fileMain.exe]"
+          WorkingDirectory="INSTALLFOLDER" />
+        <RemoveFolder Id="StartMenuFolder"
+          On="uninstall" />
+        <RegistryValue Root="HKCU"
+          Key="Software\jami.net\$(var.Name)"
+          Name="startmenu"
+          Type="integer"
+          Value="1"
+          KeyPath="yes" />
       </Component>
     </DirectoryRef>
   </Fragment>
 
   <Fragment Id="OtherRegistryEntries">
     <DirectoryRef Id="TARGETDIR">
-      <Component Id="RegistryEntries" Guid="*" Win64="yes">
-        <RegistryValue Root="HKCU" Key="Software\jami.net\$(var.AppName)" Name="hasRun" Type="integer" Value="0" KeyPath="yes" />
+      <Component Id="RegistryEntries"
+        Guid="*"
+        Win64="yes">
+        <RegistryValue Root="HKCU"
+          Key="Software\jami.net\$(var.AppName)"
+          Name="hasRun"
+          Type="integer"
+          Value="0"
+          KeyPath="yes" />
       </Component>
     </DirectoryRef>
   </Fragment>
 
   <Fragment Id="URLProtocol">
     <DirectoryRef Id="TARGETDIR">
-      <Component Id="URLProtocolRegistryEntries" Guid="*" Win64="yes">
-        <RegistryKey Root="HKCR" Key="jami" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-          <RegistryValue Type="string" Name="URL Protocol" Value="" />
-          <RegistryValue Type="string" Value="URL:jami"/>
+      <Component Id="URLProtocolRegistryEntries"
+        Guid="*"
+        Win64="yes">
+        <RegistryKey Root="HKCR"
+          Key="jami"
+          ForceCreateOnInstall="yes"
+          ForceDeleteOnUninstall="yes">
+          <RegistryValue Type="string"
+            Name="URL Protocol"
+            Value="" />
+          <RegistryValue Type="string"
+            Value="URL:jami"/>
           <RegistryKey Key="DefaultIcon">
-            <RegistryValue Type="string" Value="[APPLICATIONFOLDER]$(var.ExeName).exe" />
+            <RegistryValue Type="string"
+              Value="[APPLICATIONFOLDER]$(var.ExeName).exe" />
           </RegistryKey>
           <RegistryKey Key="shell\open\command">
-            <RegistryValue Type="string" Value='"[APPLICATIONFOLDER]$(var.ExeName).exe" "%1"' />
+            <RegistryValue Type="string"
+              Value='"[APPLICATIONFOLDER]$(var.ExeName).exe" "%1"' />
           </RegistryKey>
         </RegistryKey>
       </Component>
@@ -137,47 +223,88 @@
 
   <Fragment Id="UI">
     <UI Id="CustomUI">
-      <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+      <Property Id="WixAppFolder"
+        Value="WixPerMachineFolder" />
 
       <!--APPLICATIONFOLDER required by WixUI_Advanced, ApplicationFolderName reset APPLICATIONFOLDER path-->
-      <Property Id="ApplicationFolderName" Value="$(var.Manufacturer)\$(var.AppName)" />
+      <Property Id="ApplicationFolderName"
+        Value="$(var.Manufacturer)\$(var.AppName)" />
       <UIRef Id="WixUI_Advanced" />
 
       <!--Remove User Exit Dialog-->
-      <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish>
-      <Publish Dialog="FeaturesDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish>
-      <Publish Dialog="MaintenanceWelcomeDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish>
+      <Publish Dialog="AdvancedWelcomeEulaDlg"
+        Control="Cancel"
+        Property="AbortInstall"
+        Value="1">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+        Control="Cancel"
+        Property="AbortInstall"
+        Value="1">1</Publish>
+      <Publish Dialog="FeaturesDlg"
+        Control="Cancel"
+        Property="AbortInstall"
+        Value="1">1</Publish>
+      <Publish Dialog="MaintenanceWelcomeDlg"
+        Control="Cancel"
+        Property="AbortInstall"
+        Value="1">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg"
+        Control="Cancel"
+        Property="AbortInstall"
+        Value="1">1</Publish>
 
       <!--Launch Program If Checkbox is clicked-->
-      <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+      <Publish Dialog="ExitDialog"
+        Control="Finish"
+        Event="DoAction"
+        Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
 
       <InstallUISequence>
-        <Show Dialog="UserExit" OnExit="cancel">NOT AbortInstall = 1</Show>
-        <Custom Action="Overwrite_WixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" />
+        <Show Dialog="UserExit"
+          OnExit="cancel">NOT AbortInstall = 1</Show>
+        <Custom Action="Overwrite_WixSetDefaultPerMachineFolder"
+          After="WixSetDefaultPerMachineFolder" />
       </InstallUISequence>
     </UI>
     <InstallExecuteSequence>
-      <Custom Action='TerminateAppProcess' Before='InstallValidate'/>
-      <Custom Action="RemoveOldJamiFiles" After="RemoveFiles" />
-      <Custom Action="LaunchApplication_nonUI" After="InstallFinalize"> WIXNONUILAUNCH </Custom>
-      <Custom Action="Overwrite_WixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" />
+      <Custom Action='TerminateAppProcess'
+        Before='InstallValidate'/>
+      <Custom Action="RemoveOldJamiFiles"
+        After="RemoveFiles" />
+      <Custom Action="LaunchApplication_nonUI"
+        After="InstallFinalize"> WIXNONUILAUNCH </Custom>
+      <Custom Action="Overwrite_WixSetDefaultPerMachineFolder"
+        After="WixSetDefaultPerMachineFolder" />
     </InstallExecuteSequence>
 
     <!--License check box text, Launch check box text (auto check)-->
-    <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Launch $(var.Name)" />
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch $(var.Name)" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT"
+      Value="Launch $(var.Name)" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
+      Value="Launch $(var.Name)" />
     <!--CheckBox Default Set to One-->
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
-    <Property Id="LicenseAccepted" Value="1"/>
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX"
+      Value="1"/>
+    <Property Id="LicenseAccepted"
+      Value="1"/>
 
-    <Property Id="WixShellExecTarget" Value="[#fileMain.exe]" />
-    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
-    <CustomAction Id="LaunchApplication_nonUI" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes"/>
-    <CustomAction Id="Overwrite_WixSetDefaultPerMachineFolder" Property="WixPerMachineFolder" Value="[ProgramFiles64Folder][ApplicationFolderName]" Execute="immediate" />
+    <Property Id="WixShellExecTarget"
+      Value="[#fileMain.exe]" />
+    <CustomAction Id="LaunchApplication"
+      BinaryKey="WixCA"
+      DllEntry="WixShellExec"
+      Impersonate="yes" />
+    <CustomAction Id="LaunchApplication_nonUI"
+      BinaryKey="WixCA"
+      DllEntry="WixShellExec"
+      Impersonate="yes"/>
+    <CustomAction Id="Overwrite_WixSetDefaultPerMachineFolder"
+      Property="WixPerMachineFolder"
+      Value="[ProgramFiles64Folder][ApplicationFolderName]"
+      Execute="immediate" />
     <!--License File-->
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.ReleaseDir)\License.rtf"/>
+    <WixVariable Id="WixUILicenseRtf"
+      Value="$(var.ReleaseDir)\License.rtf"/>
   </Fragment>
 
 </Wix>

JamiInstaller/StandardComponents.wxs

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Generated with WiX's heat tool using the command:
-    heat.exe dir x64\Release -ag -cg ProductComponents -dr APPLICATIONFOLDER -srd -var var.ReleaseDir -out JamiInstaller\Components.wxs
-    Includes:
-        - the api-ms-win dlls missing parts of vc merge module for windows 7 support
-        - Jami.exe with a named Id so we can reference it in Product.wxs to launch after install
-
-    We run heat in the prebuild step on x64\Release without Jami.exe (instead of an XSLT file), to harvest everything else.
--->
-<?include Config.wxi?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment>
-        <ComponentGroup Id="StandardComponents">
-            <Component Id="cmp9C61F84AF9761955FBF397AFAE21C11B" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil2089BEC9A7AB899CED5A5EE501789299" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-core-file-l1-2-0.dll" />
-            </Component>
-            <Component Id="cmp03BB2697EE10869C4A329E3EA987EFAA" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil44C27F2C97596734BB3BEB7C21F7B71C" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-core-file-l2-1-0.dll" />
-            </Component>
-            <Component Id="cmp6B6AA7AEA5A4D324A4EE7DAE1B1193E0" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil1D16BE23D323A1E37FC1FC7354A9305F" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-core-localization-l1-2-0.dll" />
-            </Component>
-            <Component Id="cmpB5454FB66442C9BFD2145AE30B32D7A9" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil031B78DF53F7A3AC109410907624FC3E" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-core-processthreads-l1-1-1.dll" />
-            </Component>
-            <Component Id="cmp9F6D22CD9B1739E4F75F92F3A07E4CA1" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="filE9A3672FA504AA8E518DD72A02CD3E77" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-core-synch-l1-2-0.dll" />
-            </Component>
-            <Component Id="cmp9451422B7074D46F019614C3DE73BD17" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil3C902CA2889BB8855D285C3FBABB334F" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-core-timezone-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp349250459EC2D8C328EED5138B073E7A" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil2466F3D9FBA095A007D0909040D4D688" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-conio-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmpCC880F2B054A87EF5FC68232652231BF" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil605A691486569535A1C3548F7DCE753C" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-convert-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmpD6CB40D5A5AFF2161B7B4B4F06F03301" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil09AE032A32E2E542A232F7941AC77320" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-environment-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmpC02538029646A27A9F786AD690EB3C8E" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil7DE9C3CADCA188356922B0CBD8E313E7" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-filesystem-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp8E50197B377636123F0F1F94FFB004E7" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil584F158D11B8A380C73F1EFE8BBA92B4" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-heap-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp7F729C94A363C73DC4D91B6F48E4F859" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil4BE19B924B98D56F3155B66496D574E5" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-locale-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp7C573E66B0904BA73880788F7057AF88" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="filE8495C446FA1237E92562498D20261AA" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-math-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp7A91CED53D8F6E5F20F2049B3B5CD143" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil06951EB208628753677745AF15CC12A5" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-multibyte-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp1CE713C705A95306A1D246AC3AB9DE25" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil8D102BB81768F998470C34797459E306" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-private-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp35840DFBF4D6AE827AFC4EF2A17BB3EB" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="filC6C457BD901F940DCB673D271728F9FE" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-process-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmpEBB86BDA48FE3B9E2043C1A80D26ACD5" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="filE1B2095225B01DEFA5DA9895B432FBCB" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-runtime-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp80C8534B553078EA8B86F100FF542776" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="filDAFE58019AD70832B8304DCEA534B5EE" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-stdio-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmpCFC348111B5343749A2273A62421C07C" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil1F1B38DB330CA413655F715578D4BE1A" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-string-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp7D5450E04EC419244107942A00DF7DDF" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="filEB03BCF3155C5BAE2C2EDBF036EB659D" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-time-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmp5456679BDCC818B2E9476B416F71AAA5" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fil5B120DD384CABED37DFC2652C6462666" KeyPath="yes" Source="$(var.UcrtDir)\api-ms-win-crt-utility-l1-1-0.dll" />
-            </Component>
-            <Component Id="cmpF23755F862A15FFCBD109C85599B7F20" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="filD6887AD9110E4A8D49143C9A8F0B5843" KeyPath="yes" Source="$(var.UcrtDir)\ucrtbase.dll" />
-            </Component>
-            <Component Id="cmp9CFEE34E3A162AB05264E8B756EC1DEC" Directory="APPLICATIONFOLDER" Guid="*">
-                <File Id="fileMain.exe" KeyPath="yes" Source="$(var.ReleaseDir)\$(var.ExeName).exe" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>

README.md

@@ -38,7 +38,7 @@ cf [INSTALL.md](/INSTALL.md)
 
 # License
 
-Copyright (C) 2020-2024 Savoir-faire Linux Inc.
+Copyright (C) 2020-2025 Savoir-faire Linux Inc.
 
 Jami 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.
 

build.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # build.py --- Convenience script for building and running Jami
 
-# Copyright (C) 2016-2024 Savoir-faire Linux Inc.
+# Copyright (C) 2016-2025 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
@@ -99,8 +99,8 @@ 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',
-    'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel', 'libvdpau-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', 'pipewire-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'
 ]
 
@@ -128,7 +130,7 @@ DNF_DEPENDENCIES = [
     'gcc-c++', 'which', 'alsa-lib-devel', 'systemd-devel', 'libuuid-devel',
     'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel',
     'yaml-cpp-devel', 'swig', 'jsoncpp-devel',
-    'patch', 'libva-devel', 'openssl-devel', 'libvdpau-devel', 'msgpack-devel',
+    'patch', 'libva-devel', 'openssl-devel', 'libvdpau-devel', 'pipewire-devel', 'msgpack-devel',
     'sqlite-devel', 'openssl-static', 'pandoc', 'nasm',
     'bzip2'
 ]
@@ -152,7 +154,7 @@ APT_DEPENDENCIES = [
     'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libssl-dev',
     'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
     'libudev-dev', 'libyaml-cpp-dev', 'sip-tester', 'swig',
-    'uuid-dev', 'yasm', 'libjsoncpp-dev', 'libva-dev', 'libvdpau-dev', 'libmsgpack-dev',
+    'uuid-dev', 'yasm', 'libjsoncpp-dev', 'libva-dev', 'libvdpau-dev', 'libpipewire-0.3-dev', 'libmsgpack-dev',
     'pandoc', 'nasm', 'dpkg-dev', 'libsystemd-dev'
 ]
 
@@ -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))})
@@ -297,7 +299,7 @@ def run_dependencies(args):
         print("The win32 version does not install dependencies with this script.\nPlease continue with the --install instruction.")
         sys.exit(1)
     elif args.distribution == 'guix':
-        print(f"Building the profile defined in '{GUIX_MANIFEST}'...")
+        print(f"Building the profile defined in '{GUIX_MANIFEST}'…")
         execute_script([f'guix shell --manifest={GUIX_MANIFEST} -- true'])
 
     else:
@@ -314,7 +316,7 @@ def run_init(args):
     client_hooks_dir = '.git/hooks'
     daemon_hooks_dir = '.git/modules/daemon/hooks'
 
-    print("Installing commit-msg hooks...")
+    print("Installing commit-msg hooks…")
     # Copy the commit-msg hook to all modules in the same way.
     for hooks_dir in [client_hooks_dir, daemon_hooks_dir]:
         if not os.path.exists(hooks_dir):
@@ -322,7 +324,7 @@ def run_init(args):
         copy_file("./extras/scripts/commit-msg",
                   os.path.join(hooks_dir, "commit-msg"))
 
-    print("Installing pre-commit hooks...")
+    print("Installing pre-commit hooks…")
     format_script = "./extras/scripts/format.py"
     # Prepend with the python executable if on Windows (not WSL).
     if sys.platform == 'win32':
@@ -364,13 +366,27 @@ def cwd(path):
 def run_install(args):
     # Platforms with special compilation scripts
     if args.distribution == WIN32_DISTRIBUTION_NAME:
+        # Build daemon if not using pywinmake
         if not args.pywinmake:
             with cwd('daemon/compat/msvc'):
                 execute_script([f'python winmake.py -iv -s {args.sdk} -b daemon'])
 
+        # Prepare the build-windows.py script call
         build_windows = 'extras/scripts/build-windows.py'
+        # Initialize build environment
         execute_script([f'python {build_windows} --init'])
-        execute_script([f'python {build_windows} --qt={args.qt}'])
+
+        # Construct build command with options
+        build_cmd = [
+            'python',
+            build_windows,
+            f'--qt={args.qt}'
+        ]
+
+        if args.enable_crash_reports:
+            build_cmd.append('--enable-crash-reports')
+
+        execute_script([' '.join(build_cmd)])
         return True
 
     # Unix-like platforms
@@ -387,6 +403,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 +413,10 @@ 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.enable_crash_reports:
+        install_args.append('-C')
 
     if args.distribution == OSX_DISTRIBUTION_NAME:
         # The `universal_newlines` parameter has been renamed to `text` in
@@ -598,7 +620,7 @@ def run_run(args):
             client_process.wait()
 
     except KeyboardInterrupt:
-        print("\nCaught KeyboardInterrupt...")
+        print("\nCaught KeyboardInterrupt…")
 
     finally:
         if args.debug:
@@ -608,7 +630,7 @@ def run_run(args):
             try:
                 # Only kill the processes if they are running, as they
                 # could have been closed by the user.
-                print("Killing processes...")
+                print("Killing processes…")
                 if args.no_libwrap:
                     jamid_log.close()
                     if jamid_process.poll() is None:
@@ -723,6 +745,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 +763,12 @@ 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')
+    ap.add_argument('--enable-crash-reports',
+                    action='store_true', default=False,
+                    help='Enable crash reporting')
 
     dist = choose_distribution()
 

extras/build/cmake/cmake_uninstall.cmake.in

@@ -1,7 +1,7 @@
 #  Taken from:
 #  https://cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
 #
-#  Copyright (C) 2021-2024 Savoir-faire Linux Inc.
+#  Copyright (C) 2021-2025 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

extras/build/cmake/contrib_tools.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Savoir-faire Linux Inc.
+# Copyright (C) 2024-2025 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
@@ -17,20 +17,26 @@
 include(FetchContent)
 include(CMakeParseArguments)
 
-# Helper function to check if the current distribution is Red Hat-based
-function(check_redhat_based IS_REDHAT_BASED)
-  set(${IS_REDHAT_BASED} FALSE PARENT_SCOPE)
+# 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\"" MATCH_RESULT "${OS_RELEASE_CONTENT}")
-      if(MATCH_RESULT)
-        set(${IS_REDHAT_BASED} TRUE PARENT_SCOPE)
+      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 "Not a Red Hat-based distribution")
+        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")
@@ -71,13 +77,15 @@ function(add_fetch_content)
 
   # Apply options
   list(LENGTH AFCWP_OPTIONS options_length)
-  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()
+  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})

extras/build/cmake/extra_tools.cmake

@@ -0,0 +1,38 @@
+# Copyright (C) 2024-2025 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/cmake/generate_version_info.cmake

@@ -0,0 +1,34 @@
+find_package(Git QUIET REQUIRED)
+
+message(STATUS "Generating version information...")
+
+function(configure_version_string SOURCE_DIR VERSION_STRING_OUT)
+  # Get short git SHA
+  execute_process(
+    COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
+    WORKING_DIRECTORY "${SOURCE_DIR}"
+    OUTPUT_VARIABLE _GIT_SHA
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  # Output the VERSION_STRING_OUT to the caller
+  set(${VERSION_STRING_OUT} "${_GIT_SHA}" PARENT_SCOPE)
+endfunction()
+
+# These need to be set to the parent scripts values for configure_file to work,
+# as it prepends CMAKE_CURRENT_SOURCE_DIR to the <input> and CMAKE_CURRENT_BINARY_DIR
+# to <output>.
+set(CMAKE_CURRENT_SOURCE_DIR ${APP_SOURCE_DIR})
+set(CMAKE_CURRENT_BINARY_DIR ${APP_BINARY_DIR})
+
+# Generate the version string for the application and core
+configure_version_string(${APP_SOURCE_DIR} APP_VERSION_STRING)
+configure_version_string(${CORE_SOURCE_DIR} CORE_VERSION_STRING)
+
+# Get output file names with the .in extension removed
+get_filename_component(VERSION_CPP_FILENAME ${CPP_INT_FILE} NAME_WE)
+set(VERSION_CPP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${VERSION_CPP_FILENAME}.cpp")
+
+message(STATUS "infiles: ${CPP_INT_FILE}")
+message(STATUS "outfiles: ${VERSION_CPP_FILE}")
+configure_file(${CPP_INT_FILE} ${VERSION_CPP_FILE})

extras/build/cmake/macos_qt_deploy.cmake

@@ -1,7 +0,0 @@
-message("Qt deploying in dir " ${QML_SRC_DIR})
-execute_process(COMMAND "${MAC_DEPLOY_QT_PATH}/macdeployqt"
-                            ${EXE_NAME}
-                            -qmldir=${QML_SRC_DIR})
-if(${ENABLE_SPARKLE} MATCHES true)
-    file(COPY ${SPARKLE_PATH} DESTINATION ${EXE_NAME}/Contents/Frameworks/)
-endif()

extras/build/cmake/modules/FindLibJami.cmake

@@ -1,8 +1,4 @@
-# Copyright (C) 2015-2024 Savoir-faire Linux Inc.
-#
-# Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
-# Author: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
-# Author: Amin Bandali <amin.bandali@savoirfairelinux.com>
+# Copyright (C) 2015-2025 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

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 \
@@ -65,6 +66,7 @@ RUN apt-get install -y -o Acquire::Retries=10 \
         libvdpau-dev \
         libssl-dev
 RUN apt-get install -y pandoc \
+        libcppunit-dev \
         googletest \
         libgtest-dev \
         wget

extras/ci/client-qt-gnulinux/Jenkinsfile

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Savoir-faire Linux Inc.
+ * Copyright (C) 2022-2025 Savoir-faire Linux Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -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/crash-reports/example-submission-servers/.gitignore

@@ -0,0 +1,9 @@
+# python virtual environment
+venv/
+# python compiled files
+*.pyc
+# python cache
+__pycache__
+
+# example output
+crash_reports/

extras/crash-reports/example-submission-servers/README.md

@@ -0,0 +1,51 @@
+# Crash report submission server examples
+
+## Overview
+
+This directory contains an example of a crash report submission server. This server is responsible for receiving crash reports from clients and storing them. The example is written in Python and uses the Flask web framework with Waitress as the WSGI server. It exposes one endpoint for submitting crash reports on the `/submit` path using the POST method on port `8080`.
+
+It also contains an example of a crash report access server. This server is responsible for displaying the crash reports. It uses port `8081` and provides a simple HTML page that lists crash reports by page.
+
+## Running the examples
+
+To run the examples, you need to have Python 3 installed. You can just use the virtual environment provided in this directory. To activate the virtual environment, run the following commands:
+
+```
+python3 -m venv venv
+source venv/bin/activate
+python3 -m pip install -r requirements.txt
+```
+
+
+> ⚠️ On Windows, you need to use `venv\Scripts\activate` instead of `source venv/bin/activate`.
+
+After activating the virtual environment, you can should be able to execute the example submission server. To run the example submission server that uses the Crashpad format, run the following command:
+
+```
+python3 crashpad_submit_server.py
+```
+
+To run a server that displays the crash reports, run the following command:
+
+```
+python3 report_access_server.py
+```
+
+> ⚠️ It is recommended to run the report access server in a way that is not publicly accessible.
+
+Either server can be run on the same machine or on different machines, and each can be run using the `--debug` flag to enable debugging.
+
+## Metadata
+
+The crash report submission servers expect the crash reports to contain a JSON object. The JSON object should contain the following basic metadata:
+```
+{
+    "build_id": "202410021437",
+    "client_sha": "77149ebd62",
+    "guid": "50c4218a-bcb9-48a9-8093-a06e6435cd61",
+    "jamicore_sha": "cbf8f0af6",
+    "platform": "Ubuntu 22.04.4 LTS_x86_64"
+}
+```
+
+The `build_id` field is the build identifier of the client application. The `client_sha` field is the SHA-1 hash of the client application. The `guid` field is a unique identifier for the crash report. The `jamicore_sha` field is the SHA-1 hash of the Jami core library. The `platform` field is the platform on which the client application is running.

extras/crash-reports/example-submission-servers/crashpad_submit_server.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+
+import os
+from flask import Flask, request, jsonify
+import json
+import argparse
+
+app = Flask(__name__)
+BASE_PATH = 'crash_reports'
+
+@app.route('/submit', methods=['POST'])
+def submit():
+    try:
+        print("Received a crash report GUID: %s" % request.form.get('guid', 'No GUID provided'))
+        file_storage = request.files.get('upload_file_minidump')
+        dump_id = ""
+        if file_storage:
+            dump_id = file_storage.filename
+
+            # Create a directory to store the crash reports if it doesn't exist
+            if not os.path.exists(BASE_PATH):
+                os.makedirs(BASE_PATH)
+
+            filepath = os.path.join(BASE_PATH, dump_id)
+
+            # Attempt to write the file, fail gracefully if it already exists
+            if os.path.exists(filepath):
+                print(f"File {filepath} already exists.")
+                return 'File already exists', 409
+            with open(filepath, 'wb') as f:
+                f.write(file_storage.read())
+            print(f"File saved successfully at {filepath}")
+
+            # Now save the metadata in {request.form} as separate filename <UID>.info.
+            metadata_filepath = os.path.join(BASE_PATH, f"{dump_id}.info")
+            with open(metadata_filepath, 'w') as f:
+                f.write(str(json.dumps(dict(request.form), indent=4)))
+        else:
+            print("No file found for the key 'upload_file_minidump'")
+            return 'No file found', 400
+
+        return 'Crash report received', 200
+    except OSError as e:
+        print(f"Error creating directory or writing file: {e}")
+        return 'Internal Server Error', 500
+    except Exception as e:
+        print(f"An unexpected error occurred: {e}")
+        return 'Internal Server Error', 500
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Crash report submission server')
+    parser.add_argument('--debug', action='store_true', help='Run in debug mode')
+    args = parser.parse_args()
+
+    if args.debug:
+        app.run(port=8080, debug=True)
+    else:
+        from waitress import serve
+        print("Starting production server on port 8080...")
+        serve(app, host='0.0.0.0', port=8080)

extras/crash-reports/example-submission-servers/report_access_server.py

@@ -0,0 +1,252 @@
+#!/usr/bin/env python3
+
+import os
+from flask import Flask, request, jsonify, render_template_string, send_file
+import json
+from datetime import datetime
+import argparse
+
+app = Flask(__name__)
+BASE_PATH = 'crash_reports'
+
+@app.route('/', methods=['GET'])
+def list_reports():
+    try:
+        if not os.path.exists(BASE_PATH):
+            return jsonify({"error": "No reports directory found"}), 404
+
+        # Get page number from query parameters, default to 1
+        page = int(request.args.get('page', 1))
+        per_page = 10
+
+        reports = os.listdir(BASE_PATH)
+        if not reports:
+            return render_template_string("""
+                <h1>Crash Reports</h1>
+                <p>No crash reports found.</p>
+            """)
+
+        # Build report pairs with metadata
+        report_pairs = []
+        for report in reports:
+            if not report.endswith('.info'):
+                info_file = f"{report}.info"
+                if info_file in reports:
+                    try:
+                        dump_path = os.path.join(BASE_PATH, report)
+                        timestamp = os.path.getctime(dump_path)
+                        upload_time = datetime.fromtimestamp(timestamp)
+
+                        with open(os.path.join(BASE_PATH, info_file), 'r') as f:
+                            metadata = json.load(f)
+                            report_pairs.append({
+                                'dump_file': report,
+                                'info_file': info_file,
+                                'metadata': metadata,
+                                'sort_key': f"{metadata.get('client_sha', '')}-{metadata.get('jamicore_sha', '')}",
+                                'download_name': f"{metadata.get('client_sha', 'unknown')}-{metadata.get('jamicore_sha', 'unknown')}-{metadata.get('platform', 'unknown').replace(' ', '_')}",
+                                'upload_time': upload_time
+                            })
+                    except json.JSONDecodeError:
+                        print(f"Error parsing metadata file: {info_file}")
+                        continue
+
+        # Sort reports by upload time (most recent first), then by SHA
+        report_pairs.sort(key=lambda x: (-x['upload_time'].timestamp(), x['sort_key']))
+
+        # Calculate pagination values
+        total_reports = len(report_pairs)
+        total_pages = (total_reports + per_page - 1) // per_page
+        page = min(max(1, page), total_pages or 1)  # Handle case when total_pages is 0
+        start_idx = (page - 1) * per_page
+        end_idx = start_idx + per_page
+
+        # Get current page's reports
+        current_page_reports = report_pairs[start_idx:end_idx]
+
+        return render_template_string("""
+            <!DOCTYPE html>
+            <html lang="en">
+            <head>
+                <meta charset="UTF-8">
+                <title>Crash Reports</title>
+                <style>
+                    body { font-family: Arial, sans-serif; margin: 2em; }
+                    .header {
+                        margin-bottom: 2em;
+                    }
+                    .header h1 {
+                        margin-bottom: 0.5em;
+                    }
+                    .report-list { list-style: none; padding: 0; }
+                    .report-item { margin: 1em 0; padding: 1em; border: 1px solid #ddd; border-radius: 4px; }
+                    .download-link {
+                        display: inline-block;
+                        padding: 8px 16px;
+                        background-color: #0066cc;
+                        color: white;
+                        text-decoration: none;
+                        border-radius: 4px;
+                        margin: 8px 0;
+                    }
+                    .download-link:hover { background-color: #0052a3; }
+                    .metadata-table {
+                        border-collapse: collapse;
+                        width: 100%;
+                        margin: 8px 0;
+                    }
+                    .metadata-table td {
+                        padding: 4px 8px;
+                        border-bottom: 1px solid #ddd;
+                    }
+                    .metadata-table td:first-child {
+                        font-weight: bold;
+                        width: 150px;
+                    }
+                    .upload-time {
+                        color: #666;
+                        font-size: 0.9em;
+                        margin-bottom: 8px;
+                    }
+                    .pagination {
+                        margin: 1em 0;
+                        text-align: center;
+                    }
+                    .pagination a, .pagination span {
+                        display: inline-block;
+                        padding: 8px 16px;
+                        margin: 0 4px;
+                        border: 1px solid #ddd;
+                        border-radius: 4px;
+                        text-decoration: none;
+                        color: #0066cc;
+                    }
+                    .pagination .current {
+                        background-color: #0066cc;
+                        color: white;
+                        border-color: #0066cc;
+                    }
+                    .pagination a:hover {
+                        background-color: #f5f5f5;
+                    }
+                    .pagination-info {
+                        text-align: center;
+                        color: #666;
+                        margin-bottom: 10px;
+                    }
+                </style>
+            </head>
+            <body>
+                <div class="header">
+                    <h1>Crash Reports</h1>
+                    <div class="pagination-info">
+                        Showing {{ start_idx + 1 }}-{{ [end_idx, total_reports] | min }} of {{ total_reports }} reports
+                    </div>
+                    <div class="pagination">
+                        {% if page > 1 %}
+                            <a href="{{ url_for('list_reports', page=1) }}">&laquo; First</a>
+                            <a href="{{ url_for('list_reports', page=page-1) }}">&lsaquo; Previous</a>
+                        {% endif %}
+
+                        {% for p in range([1, page-2] | max, [total_pages + 1, page + 3] | min) %}
+                            {% if p == page %}
+                                <span class="current">{{ p }}</span>
+                            {% else %}
+                                <a href="{{ url_for('list_reports', page=p) }}">{{ p }}</a>
+                            {% endif %}
+                        {% endfor %}
+
+                        {% if page < total_pages %}
+                            <a href="{{ url_for('list_reports', page=page+1) }}">Next &rsaquo;</a>
+                            <a href="{{ url_for('list_reports', page=total_pages) }}">Last &raquo;</a>
+                        {% endif %}
+                    </div>
+                </div>
+
+                <div class="report-list">
+                {% for report in reports %}
+                    <div class="report-item">
+                        <h3>Report: {{ report['sort_key'] }}</h3>
+                        <div class="upload-time">
+                            Uploaded: {{ report['upload_time'].strftime('%Y-%m-%d %H:%M:%S') }}
+                        </div>
+                        <table class="metadata-table">
+                            <tr>
+                                <td>Platform:</td>
+                                <td>{{ report['metadata']['platform'] }}</td>
+                            </tr>
+                            <tr>
+                                <td>Client SHA:</td>
+                                <td>{{ report['metadata']['client_sha'] }}</td>
+                            </tr>
+                            <tr>
+                                <td>Jami Core SHA:</td>
+                                <td>{{ report['metadata']['jamicore_sha'] }}</td>
+                            </tr>
+                            <tr>
+                                <td>Build ID:</td>
+                                <td>{{ report['metadata']['build_id'] }}</td>
+                            </tr>
+                            <tr>
+                                <td>GUID:</td>
+                                <td>{{ report['metadata']['guid'] }}</td>
+                            </tr>
+                        </table>
+                        <a class="download-link" href="{{ url_for('download_report_bundle', dump_file=report['dump_file'], info_file=report['info_file'], download_name=report['download_name']) }}">
+                            Download Report Bundle
+                        </a>
+                    </div>
+                {% endfor %}
+                </div>
+            </body>
+            </html>
+        """, reports=current_page_reports, page=page, total_pages=total_pages,
+             start_idx=start_idx, end_idx=end_idx, total_reports=total_reports)
+
+    except Exception as e:
+        print(f"Error listing reports: {e}")
+        return 'Internal Server Error', 500
+
+@app.route('/download-bundle/<path:dump_file>/<path:info_file>/<path:download_name>')
+def download_report_bundle(dump_file, info_file, download_name):
+    try:
+        import zipfile
+        from io import BytesIO
+
+        # Create a memory file for the zip
+        memory_file = BytesIO()
+
+        # Create the zip file
+        with zipfile.ZipFile(memory_file, 'w', zipfile.ZIP_DEFLATED) as zf:
+            # Add the dump file
+            dump_path = os.path.join(BASE_PATH, dump_file)
+            zf.write(dump_path, f"{download_name}.dmp")
+
+            # Add the info file
+            info_path = os.path.join(BASE_PATH, info_file)
+            zf.write(info_path, f"{download_name}.info")
+
+        # Seek to the beginning of the memory file
+        memory_file.seek(0)
+
+        return send_file(
+            memory_file,
+            mimetype='application/zip',
+            as_attachment=True,
+            download_name=f"{download_name}.zip"
+        )
+    except Exception as e:
+        print(f"Error creating zip bundle: {e}")
+        return 'Internal Server Error', 500
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Crash reports viewing server')
+    parser.add_argument('--debug', action='store_true', help='Run in debug mode')
+    args = parser.parse_args()
+
+    if args.debug:
+        app.run(port=8081, debug=True)
+    else:
+        from waitress import serve
+        print("Starting production server on port 8081...")
+        serve(app, host='0.0.0.0', port=8081)

extras/crash-reports/example-submission-servers/requirements.txt

@@ -0,0 +1,6 @@
+Flask==3.0.3
+requests==2.24.0
+markupsafe==2.1.1
+itsdangerous==2.1.2
+werkzeug==3.0.0
+waitress==3.0.2

extras/data/jami.appdata.xml

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015-2024 Savoir-faire Linux Inc. -->
-<component type="desktop-application">
- <id>net.jami.Jami</id>
- <metadata_license>CC-BY-SA-3.0</metadata_license>
- <project_license>GPL-3.0+</project_license>
- <name>Jami</name>
- <summary>Privacy-oriented voice, video, chat, and conference platform</summary>
- <summary xml:lang="hu">Adatvédelem-orientált hang-, video-, csevegés- és konferenciaplatform</summary>
- <icon type="stock">jami</icon>
- <description>
-    <p>
-      An end-to-end encrypted secure and distributed voice, video, and
-      chat communication platform that requires no central server and
-      leaves the power of privacy and freedom in the hands of users.
-    </p>
-    <p>
-      Jami supports the following key features:
-    </p>
-    <ul>
-      <li>One-to-one conversations</li>
-      <li>File sharing</li>
-      <li>Audio calls and conferences</li>
-      <li>Video calls and conferences</li>
-      <li>Screen sharing in video calls and conferences</li>
-      <li>Recording and sending audio messages</li>
-      <li>Recording and sending video messages</li>
-      <li>Functioning as a SIP phone software</li>
-    </ul>
-    <p>
-      Client applications for GNU/Linux, Windows, macOS, iOS, Android,
-      and Android TV are available, making Jami an interoperable and
-      cross-platform communication framework.
-    </p>
-
-    <p xml:lang="hu">
-      Végpontokig titkosított biztonságos és elosztott hang-, videó-
-      és csevegés-kommunikációs platform, amely nem igényel központi
-      kiszolgálót, és a felhasználók kezében hagyja a magánélet és a
-      szabadság hatalmát.
-    </p>
-    <p xml:lang="hu">
-      A Jami a következő főbb funkciókat támogatja:
-    </p>
-    <ul>
-      <li xml:lang="hu">Személyes beszélgetések</li>
-      <li xml:lang="hu">Fájlmegosztás</li>
-      <li xml:lang="hu">Hanghívások és konferenciák</li>
-      <li xml:lang="hu">Videohívások és konferenciák</li>
-      <li xml:lang="hu">Képernyőmegosztás videohívásokban és
-        konferenciákon</li>
-      <li xml:lang="hu">Hangüzenetek rögzítése és küldése</li>
-      <li xml:lang="hu">Videoüzenetek rögzítése és küldése</li>
-      <li xml:lang="hu">SIP-telefonszoftverként működik</li>
-    </ul>
-    <p xml:lang="hu">
-      Elérhetők a GNU/Linux, Windows, macOS, iOS, Android és Android TV
-      ügyfélalkalmazásai, így a Jami interoperábilis és többplatformos
-      kommunikációs keretrendszerré válik.
-    </p>
-
- </description>
-
- <url type="homepage">https://jami.net/</url>
- <url type="bugtracker">https://git.jami.net/savoirfairelinux/jami-client-qt/issues</url>
- <url type="faq">https://jami.net/help/</url>
- <url type="help">https://docs.jami.net</url>
- <url type="donation">https://www.paypal.com/donate/?hosted_button_id=MGUDJLQZ4TP5W</url>
- <url type="translate">https://www.transifex.com/savoirfairelinux/jami</url>
-
- <!-- Maximum caption length is 60 characters -->
- <!-- Officially GIF is not an allowed video format, but it appears to work nonetheless -->
- <screenshots>
-  <screenshot type="default">
-   <caption>Send Audio, Video and Chat messages</caption>
-   <caption xml:lang="hu">Hang-, video- és csevegőüzeneteket küldhet</caption>
-   <image type="source" width="1310" height="650">https://dl.jami.net/media-resources/screenshots/jami_linux_audiovideo.png</image>
-  </screenshot>
-  <screenshot>
-   <caption>Easily share desktop contents</caption>
-   <caption xml:lang="hu">Könnyen megoszthatja az asztali tartalmat</caption>
-   <image type="source" width="1016" height="659">https://dl.jami.net/media-resources/screenshots/jami_linux_screenshare.png</image>
-  </screenshot>
-  <screenshot>
-   <caption>Crystal clear audio calls between Jami users</caption>
-   <caption xml:lang="hu">Kristálytiszta hanghívások a Jami felhasználók között</caption>
-   <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/audio-call_web.webm</video>
-  </screenshot>
-  <screenshot>
-   <caption>Conference calls with an unlimited participants</caption>
-   <caption xml:lang="hu">Konferenciahívások korlátlan számú résztvevővel</caption>
-   <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/conference_web.webm</video>
-  </screenshot>
-  <screenshot>
-   <caption>Encrypted and secure text messaging, no servers</caption>
-   <caption xml:lang="hu">Titkosított és biztonságos csevegési üzenetküldés, kiszolgálók nélkül</caption>
-   <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/chat_web.webm</video>
-  </screenshot>
-  <screenshot>
-   <caption>Send files of any size</caption>
-   <caption xml:lang="hu">Bármilyen méretű fájl küldése</caption>
-   <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/files-share_web.webm</video>
-  </screenshot>
- </screenshots>
-
- <launchable type="desktop-id">jami.desktop</launchable>
-
- <provides><binary>jami</binary></provides>
-
- <!-- https://specifications.freedesktop.org/menu-spec/latest/apa.html -->
- <!-- https://specifications.freedesktop.org/menu-spec/latest/apas02.html -->
- <categories>
-  <category>Chat</category>
-  <category>Communication</category>
-  <category>FileTransfer</category>
-  <category>InstantMessaging</category>
-  <category>Network</category>
-  <category>P2P</category>
-  <category>Productivity</category>
- </categories>
-
- <translation type="gettext">jami-client-qt</translation>
-
- <content_rating type="oars-1.1">
-  <content_attribute id="social-chat">intense</content_attribute>
-  <content_attribute id="social-audio">intense</content_attribute>
- </content_rating>
-
- <requires><id>net.jami.daemon</id></requires>
-
-</component>

extras/data/jami.xml

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<components version="0.14" origin="jami">
+  <component type="desktop-application">
+    <id>net.jami.Jami</id>
+    <pkgname>jami</pkgname>
+    <name>Jami</name>
+    <summary>Privacy-oriented voice, video, chat, and conference platform</summary>
+    <summary xml:lang="hu">Adatvédelem-orientált hang-, video-, csevegés- és konferenciaplatform</summary>
+    <project_license>GPL-3.0+</project_license>
+    <description>
+      <p>Jami, a GNU package, is software for universal and distributed peer-to-peer communication that respects the freedom and privacy of its users.</p>
+      <p>Jami is the simplest and easiest way to connect with people (and devices) with instant messaging, audio and video calls over the Internet and LAN/WAN intranets.</p>
+      <p>Jami is a free/libre, end-to-end encrypted, and private communication platform.</p>
+      <p>Jami – which used to be known as Ring – is also an open-source alternative (to Facebook Messenger, Signal, Skype, Teams, Telegram, TikTok, Viber, WhatsApp, Zoom) that prioritizes the privacy of its users.</p>
+      <p>Jami has a professional-looking design and is available for a wide range of platforms. Unlike the alternatives, calls using Jami are directly between users as it does not use servers to handle calls.</p>
+      <p>This gives the greatest privacy as the distributed nature of Jami means your calls are only between participants.</p>
+      <p>One-to-one and group conversations with Jami are enhanced with: instant messaging; audio and video calling; recording and sending audio and video messages; file transfers; screen sharing; and, location sharing.</p>
+      <p>Jami can also function as a SIP client.</p>
+      <p>Jami has multiple extensions available: Audio Filter; Auto Answer; Green Screen; Watermark; and, Whisper Transcript.</p>
+      <p>Jami can be easily deployed in organizations with the “Jami Account Management Server” (JAMS), allowing users to connect with their corporate credentials or create local accounts. JAMS allows you to manage your own Jami community while taking advantage of Jami’s distributed network architecture.</p>
+      <p>Jami is available for GNU/Linux, Windows, macOS, iOS, Android, and Android TV, making Jami an interoperable and cross-platform communication framework.</p>
+      <p>Manage multiple SIP accounts, Jami accounts and JAMS accounts with the Jami client installed on one or multiple devices.</p>
+      <p>Jami is free, unlimited, private, advertising free, compatible, fast, autonomous, and anonymous.</p>
+      <p>Learn more about:</p>
+      <ul>
+        <li>Jami: https://jami.net/</li>
+        <li>Jami extensions: https://jami.net/extensions/</li>
+        <li>“Jami Account Management Server” (JAMS): https://jami.biz/</li>
+        <li>Jami documentation: https://docs.jami.net/</li>
+      </ul>
+      <p>Follow us for more:</p>
+      <ul>
+        <li>Mastodon: https://mstdn.io/@Jami</li>
+        <li>X: https://x.com/jami_social</li>
+        <li>YouTube: https://www.youtube.com/@jami9311</li>
+      </ul>
+      <p>We’d love to hear from you! Join the Jami community:</p>
+      <ul>
+        <li>Contribute: https://jami.net/contribute/</li>
+        <li>Forum: https://forum.jami.net/</li>
+      </ul>
+      <p>Build with Jami on your IoT project: re-use the universal communications technology of Jami with its portable library on your system of choice.</p>
+      <p>Jami for Android TV is tested on NVIDIA SHIELD TV with Logitech cameras.</p>
+      <p>Jami is published under the GPL license, version 3 or higher.</p>
+      <p>Copyright © Savoir-faire Linux Inc.</p>
+    </description>
+    <description xml:lang="hu">
+      <p>A Jami, egy GNU-csomag, egy univerzális és elosztott társ-társ kommunikációra szolgáló szoftver, amely tiszteletben tartja a felhasználók szabadságát és magánéletét.</p>
+      <p>A Jami a legegyszerűbb és legegyszerűbb módja annak, hogy azonnali üzenetküldéssel, hang- és videohívásokkal kapcsolódjon az emberekhez (és eszközökhöz) az interneten és a LAN/WAN intraneteken keresztül.</p>
+      <p>A Jami egy ingyenes, teljes körűen titkosított és privát kommunikációs platform.</p>
+      <p>A Jami – amelyet korábban Ring néven ismertek – egy nyílt forráskódú alternatíva is (a Facebook Messenger, a Signal, a Skype, a Teams, a Telegram, a TikTok, a Viber, a WhatsApp, a Zoom számára), amely előtérbe helyezi a felhasználók magánéletét.</p>
+      <p>A Jami professzionális megjelenésű, és platformok széles skálájához elérhető. Az alternatívákkal ellentétben a Jami-t használó hívások közvetlenül a felhasználók között zajlanak, mivel nem használ kiszolgálókat a hívások kezelésére.</p>
+      <p>Ez biztosítja a legnagyobb magánéletet, mivel a Jami elosztott jellege azt jelenti, hogy a hívások csak a résztvevők között zajlanak.</p>
+      <p>A Jamival folytatott személyes és csoportos beszélgetéseket a következők javítják: azonnali üzenetküldés; hang- és videohívások; hang- és videoüzenetek rögzítése és küldése; fájlátvitel; képernyőmegosztás; és helymegosztás.</p>
+      <p>A Jami SIP-ügyfélként is működhet.</p>
+      <p>A Jami-nek több bővítménye is elérhető: hangszűrő; automatikus válasz; zöld képernyő; vízjel; és, suttogó átirat.</p>
+      <p>A Jami könnyen telepíthető a szervezetekben a JAMS (Jami Account Management Server – Jami fiókkezelő kiszolgáló), amely lehetővé teszi a felhasználók számára, hogy csatlakozzanak vállalati hitelesítő adataikhoz, vagy helyi fiókokat hozzanak létre. A JAMS lehetővé teszi saját Jami közösségének kezelését, miközben kihasználja a Jami elosztott hálózati architektúráját.</p>
+      <p>A Jami elérhető GNU/Linux, Windows, macOS, iOS, Android és Android TV rendszereken, így a Jami egy interoperábilis és platformok közötti kommunikációs keretrendszer.</p>
+      <p>Kezeljen több SIP-fiókot, Jami-fiókot és JAMS-fiókot az egy vagy több eszközre telepített Jami-ügyféllel.</p>
+      <p>A Jami ingyenes, korlátlan, privát, reklámmentes, kompatibilis, gyors, autonóm és névtelen.</p>
+      <p>További tájékoztatás:</p>
+      <ul>
+        <li>Jami: https://jami.net/hu/</li>
+        <li>Jami-bővítmények: https://jami.net/hu/extensions/</li>
+        <li>JAMS (Jami Account Management Server – Jami fiókkezelő kiszolgáló): https://jami.biz/</li>
+        <li>Jami-dokumentáció: https://docs.jami.net/hu/</li>
+      </ul>
+      <p>Kövess minket a továbbiakért:</p>
+      <ul>
+        <li>Mastodon: https://mstdn.io/@Jami</li>
+        <li>X: https://x.com/jami_social</li>
+        <li>YouTube: https://www.youtube.com/@jami9311</li>
+      </ul>
+      <p>Szívesen hallanánk felőled! Csatlakozzon a Jami közösséghez:</p>
+      <ul>
+        <li>Közreműködés: https://jami.net/hu/contribute/</li>
+        <li>Fórum: https://forum.jami.net/</li>
+      </ul>
+      <p>Építsen a Jamival IoT-projektjére: használja újra a Jami univerzális kommunikációs technológiáját a hordozható könyvtárával a választott rendszerén.</p>
+      <p>A Jami for Android TV-t Logitech kamerákkal ellátott NVIDIA SHIELD TV-n tesztelték.</p>
+      <p>A Jami a GPL licenc 3-as vagy újabb verziója alatt jelent meg.</p>
+      <p>Szerzői jog © Savoir-faire Linux Inc.</p>
+    </description>
+    <requires>
+      <id>net.jami.daemon</id>
+    </requires>
+    <launchable type="desktop-id">net.jami.Jami.desktop</launchable>
+    <icon type="stock">jami</icon>
+    <url type="homepage">https://jami.net/</url>
+    <url type="bugtracker">https://git.jami.net/savoirfairelinux/jami-client-qt/issues</url>
+    <url type="faq">https://docs.jami.net/user/faq.html</url>
+    <url type="help">https://forum.jami.net/</url>
+    <url type="donation">https://jami.net/whydonate/</url>
+    <url type="translate">https://www.transifex.com/savoirfairelinux/jami</url>
+    <categories>
+      <category>Chat</category>
+      <category>FileTransfer</category>
+      <category>InstantMessaging</category>
+      <category>Network</category>
+      <category>P2P</category>
+      <category>Telephony</category>
+      <category>VideoConference</category>
+    </categories>
+    <provides>
+      <binary>jami</binary>
+      <mediatype>x-scheme-handler/jami</mediatype>
+    </provides>
+    <screenshots>
+      <screenshot type="default">
+        <caption>Send chat messages and talk with audio and video</caption>
+        <caption xml:lang="hu">Csevegőüzenetek küldése, valamint hang- és videobeszélgetés</caption>
+        <image type="source" width="1310" height="650">https://dl.jami.net/media-resources/screenshots/jami_linux_audiovideo.png</image>
+      </screenshot>
+      <screenshot>
+        <caption>Screen sharing</caption>
+        <caption xml:lang="hu">Képernyőmegosztás</caption>
+        <image type="source" width="1016" height="659">https://dl.jami.net/media-resources/screenshots/jami_linux_screenshare.png</image>
+      </screenshot>
+      <screenshot>
+        <caption>Crystal clear audio calls between Jami users</caption>
+        <caption xml:lang="hu">Kristálytiszta hanghívások a Jami felhasználók között</caption>
+        <video codec="vp9" container="webm" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/audio-call_web.webm</video>
+      </screenshot>
+      <screenshot>
+        <caption>Conference calls with an unlimited number of participants</caption>
+        <caption xml:lang="hu">Konferenciahívások korlátlan számú résztvevővel</caption>
+        <video codec="vp9" container="webm" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/conference_web.webm</video>
+      </screenshot>
+      <screenshot>
+        <caption>Encrypted and secure text messaging without servers</caption>
+        <caption xml:lang="hu">Titkosított és biztonságos csevegési üzenetküldés, kiszolgálók nélkül</caption>
+        <video codec="vp9" container="webm" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/chat_web.webm</video>
+      </screenshot>
+      <screenshot>
+        <caption>Transfer files of any size</caption>
+        <caption xml:lang="hu">Bármilyen méretű fájl küldése</caption>
+        <video codec="vp9" container="webm" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/files-share_web.webm</video>
+      </screenshot>
+    </screenshots>
+    <keywords>
+      <keyword>Qt</keyword>
+      <keyword>chat</keyword>
+      <keyword>talk</keyword>
+      <keyword>im</keyword>
+      <keyword>message</keyword>
+      <keyword>voip</keyword>
+    </keywords>
+    <content_rating type="oars-1.1">
+      <content_attribute id="social-chat">intense</content_attribute>
+      <content_attribute id="social-audio">intense</content_attribute>
+    </content_rating>
+  </component>
+</components>

extras/data/net.jami.Jami.metainfo.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015-2025 Savoir-faire Linux Inc. -->
+<component type="desktop-application">
+  <id>net.jami.Jami</id>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>Jami</name>
+
+  <summary>Privacy-oriented voice, video, chat, and conference platform</summary>
+  <summary xml:lang="hu">Adatvédelem-orientált hang-, video-, csevegés- és konferenciaplatform</summary>
+  <icon type="stock">jami</icon>
+
+  <description>
+    <p>Jami, a GNU package, is software for universal and distributed peer-to-peer communication that respects the freedom and privacy of its users.</p>
+    <p xml:lang="hu">A Jami, egy GNU-csomag, egy univerzális és elosztott társ-társ kommunikációra szolgáló szoftver, amely tiszteletben tartja a felhasználók szabadságát és magánéletét.</p>
+    <p>Jami is the simplest and easiest way to connect with people (and devices) with instant messaging, audio and video calls over the Internet and LAN/WAN intranets.</p>
+    <p xml:lang="hu">A Jami a legegyszerűbb és legegyszerűbb módja annak, hogy azonnali üzenetküldéssel, hang- és videohívásokkal kapcsolódjon az emberekhez (és eszközökhöz) az interneten és a LAN/WAN intraneteken keresztül.</p>
+    <p>Jami is a free/libre, end-to-end encrypted, and private communication platform.</p>
+    <p xml:lang="hu">A Jami egy ingyenes, teljes körűen titkosított és privát kommunikációs platform.</p>
+    <p>Jami – which used to be known as Ring – is also an open-source alternative (to Facebook Messenger, Signal, Skype, Teams, Telegram, TikTok, Viber, WhatsApp, Zoom) that prioritizes the privacy of its users.</p>
+    <p xml:lang="hu">A Jami – amelyet korábban Ring néven ismertek – egy nyílt forráskódú alternatíva is (a Facebook Messenger, a Signal, a Skype, a Teams, a Telegram, a TikTok, a Viber, a WhatsApp, a Zoom számára), amely előtérbe helyezi a felhasználók magánéletét.</p>
+    <p>Jami has a professional-looking design and is available for a wide range of platforms. Unlike the alternatives, calls using Jami are directly between users as it does not use servers to handle calls.</p>
+    <p xml:lang="hu">A Jami professzionális megjelenésű, és platformok széles skálájához elérhető. Az alternatívákkal ellentétben a Jami-t használó hívások közvetlenül a felhasználók között zajlanak, mivel nem használ kiszolgálókat a hívások kezelésére.</p>
+    <p>This gives the greatest privacy as the distributed nature of Jami means your calls are only between participants.</p>
+    <p xml:lang="hu">Ez biztosítja a legnagyobb magánéletet, mivel a Jami elosztott jellege azt jelenti, hogy a hívások csak a résztvevők között zajlanak.</p>
+    <p>One-to-one and group conversations with Jami are enhanced with: instant messaging; audio and video calling; recording and sending audio and video messages; file transfers; screen sharing; and, location sharing.</p>
+    <p xml:lang="hu">A Jamival folytatott személyes és csoportos beszélgetéseket a következők javítják: azonnali üzenetküldés; hang- és videohívások; hang- és videoüzenetek rögzítése és küldése; fájlátvitel; képernyőmegosztás; és helymegosztás.</p>
+    <p>Jami can also function as a SIP client.</p>
+    <p xml:lang="hu">A Jami SIP-ügyfélként is működhet.</p>
+    <p>Jami has multiple extensions available: Audio Filter; Auto Answer; Green Screen; Watermark; and, Whisper Transcript.</p>
+    <p xml:lang="hu">A Jami-nek több bővítménye is elérhető: hangszűrő; automatikus válasz; zöld képernyő; vízjel; és, suttogó átirat.</p>
+    <p>Jami can be easily deployed in organizations with the “Jami Account Management Server” (JAMS), allowing users to connect with their corporate credentials or create local accounts. JAMS allows you to manage your own Jami community while taking advantage of Jami’s distributed network architecture.</p>
+    <p xml:lang="hu">A Jami könnyen telepíthető a szervezetekben a JAMS (Jami Account Management Server – Jami fiókkezelő kiszolgáló), amely lehetővé teszi a felhasználók számára, hogy csatlakozzanak vállalati hitelesítő adataikhoz, vagy helyi fiókokat hozzanak létre. A JAMS lehetővé teszi saját Jami közösségének kezelését, miközben kihasználja a Jami elosztott hálózati architektúráját.</p>
+    <p>Jami is available for GNU/Linux, Windows, macOS, iOS, Android, and Android TV, making Jami an interoperable and cross-platform communication framework.</p>
+    <p xml:lang="hu">A Jami elérhető GNU/Linux, Windows, macOS, iOS, Android és Android TV rendszereken, így a Jami egy interoperábilis és platformok közötti kommunikációs keretrendszer.</p>
+    <p>Manage multiple SIP accounts, Jami accounts and JAMS accounts with the Jami client installed on one or multiple devices.</p>
+    <p xml:lang="hu">Kezeljen több SIP-fiókot, Jami-fiókot és JAMS-fiókot az egy vagy több eszközre telepített Jami-ügyféllel.</p>
+    <p>Jami is free, unlimited, private, advertising free, compatible, fast, autonomous, and anonymous.</p>
+    <p xml:lang="hu">A Jami ingyenes, korlátlan, privát, reklámmentes, kompatibilis, gyors, autonóm és névtelen.</p>
+    <p>Learn more about:</p>
+    <p xml:lang="hu">További tájékoztatás:</p>
+    <ul>
+      <li>Jami: https://jami.net/</li>
+      <li xml:lang="hu">Jami: https://jami.net/hu/</li>
+      <li>Jami extensions: https://jami.net/extensions/</li>
+      <li xml:lang="hu">Jami-bővítmények: https://jami.net/hu/extensions/</li>
+      <li>“Jami Account Management Server” (JAMS): https://jami.biz/</li>
+      <li xml:lang="hu">JAMS (Jami Account Management Server – Jami fiókkezelő kiszolgáló): https://jami.biz/</li>
+      <li>Jami documentation: https://docs.jami.net/</li>
+      <li xml:lang="hu">Jami-dokumentáció: https://docs.jami.net/hu/</li>
+    </ul>
+    <p>Follow us for more:</p>
+    <p xml:lang="hu">Kövess minket a továbbiakért:</p>
+    <ul>
+      <li>Mastodon: https://mstdn.io/@Jami</li>
+      <li xml:lang="hu">Mastodon: https://mstdn.io/@Jami</li>
+      <li>X: https://x.com/jami_social</li>
+      <li xml:lang="hu">X: https://x.com/jami_social</li>
+      <li>YouTube: https://www.youtube.com/@jami9311</li>
+      <li xml:lang="hu">YouTube: https://www.youtube.com/@jami9311</li>
+    </ul>
+    <p>We’d love to hear from you! Join the Jami community:</p>
+    <p xml:lang="hu">Szívesen hallanánk felőled! Csatlakozzon a Jami közösséghez:</p>
+    <ul>
+      <li>Contribute: https://jami.net/contribute/</li>
+      <li xml:lang="hu">Közreműködés: https://jami.net/hu/contribute/</li>
+      <li>Forum: https://forum.jami.net/</li>
+      <li xml:lang="hu">Fórum: https://forum.jami.net/</li>
+    </ul>
+    <p>Build with Jami on your IoT project: re-use the universal communications technology of Jami with its portable library on your system of choice.</p>
+    <p xml:lang="hu">Építsen a Jamival IoT-projektjére: használja újra a Jami univerzális kommunikációs technológiáját a hordozható könyvtárával a választott rendszerén.</p>
+    <p>Jami for Android TV is tested on NVIDIA SHIELD TV with Logitech cameras.</p>
+    <p xml:lang="hu">A Jami for Android TV-t Logitech kamerákkal ellátott NVIDIA SHIELD TV-n tesztelték.</p>
+    <p>Jami is published under the GPL license, version 3 or higher.</p>
+    <p xml:lang="hu">A Jami a GPL licenc 3-as vagy újabb verziója alatt jelent meg.</p>
+    <p>Copyright © Savoir-faire Linux Inc.</p>
+    <p xml:lang="hu">Szerzői jog © Savoir-faire Linux Inc.</p>
+  </description>
+
+  <url type="homepage">https://jami.net/</url>
+  <url type="bugtracker">https://git.jami.net/savoirfairelinux/jami-client-qt/issues</url>
+  <url type="faq">https://docs.jami.net/user/faq.html</url>
+  <url type="help">https://forum.jami.net/</url>
+  <url type="donation">https://jami.net/whydonate/</url>
+  <url type="translate">https://www.transifex.com/savoirfairelinux/jami</url>
+
+  <!-- Maximum caption length is 60 characters -->
+  <!-- Officially GIF is not an allowed video format, but it appears to work nonetheless -->
+  <screenshots>
+    <screenshot type="default">
+      <image type="source" width="1310" height="650">https://dl.jami.net/media-resources/screenshots/jami_linux_audiovideo.png</image>
+      <caption>Send chat messages and talk with audio and video</caption>
+      <caption xml:lang="hu">Csevegőüzenetek küldése, valamint hang- és videobeszélgetés</caption>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1016" height="659">https://dl.jami.net/media-resources/screenshots/jami_linux_screenshare.png</image>
+      <caption>Screen sharing</caption>
+      <caption xml:lang="hu">Képernyőmegosztás</caption>
+    </screenshot>
+    <screenshot>
+      <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/audio-call_web.webm</video>
+      <caption>Crystal clear audio calls between Jami users</caption>
+      <caption xml:lang="hu">Kristálytiszta hanghívások a Jami felhasználók között</caption>
+    </screenshot>
+    <screenshot>
+      <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/conference_web.webm</video>
+      <caption>Conference calls with an unlimited number of participants</caption>
+      <caption xml:lang="hu">Konferenciahívások korlátlan számú résztvevővel</caption>
+    </screenshot>
+    <screenshot>
+      <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/chat_web.webm</video>
+      <caption>Encrypted and secure text messaging without servers</caption>
+      <caption xml:lang="hu">Titkosított és biztonságos csevegési üzenetküldés, kiszolgálók nélkül</caption>
+    </screenshot>
+    <screenshot>
+      <video container="webm" codec="vp9" width="600" height="400">https://dl.jami.net/media-resources/gifs_features/conversiongif_webm/files-share_web.webm</video>
+      <caption>Transfer files of any size</caption>
+      <caption xml:lang="hu">Bármilyen méretű fájl küldése</caption>
+    </screenshot>
+  </screenshots>
+
+  <launchable type="desktop-id">net.jami.Jami.desktop</launchable>
+
+  <provides><binary>jami</binary></provides>
+
+  <!-- https://specifications.freedesktop.org/menu-spec/latest/apa.html -->
+  <!-- https://specifications.freedesktop.org/menu-spec/latest/apas02.html -->
+  <categories>
+    <category>Chat</category>
+    <category>FileTransfer</category>
+    <category>InstantMessaging</category>
+    <category>Network</category>
+    <category>P2P</category>
+    <category>Telephony</category>
+    <category>VideoConference</category>
+  </categories>
+
+  <translation type="gettext">jami-client-qt</translation>
+
+  <content_rating type="oars-1.1">
+    <content_attribute id="social-chat">intense</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+  </content_rating>
+
+  <requires><id>net.jami.daemon</id></requires>
+</component>

extras/packaging/gnu-linux/Jenkinsfile

@@ -1,6 +1,4 @@
-// Copyright (C) 2021-2024 Savoir-faire Linux Inc.
-//
-// Author: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
+// Copyright (C) 2021-2025 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

extras/packaging/gnu-linux/Makefile

@@ -1,7 +1,5 @@
 # -*- mode: makefile; -*-
-# Copyright (C) 2016-2024 Savoir-faire Linux Inc.
-#
-# Author: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
+# Copyright (C) 2016-2025 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
@@ -46,9 +44,9 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc
 
 # Qt versions
 QT_MAJOR := 6
-QT_MINOR := 5
-QT_PATCH := 3
-QT_TARBALL_CHECKSUM := 7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb
+QT_MINOR := 6
+QT_PATCH := 1
+QT_TARBALL_CHECKSUM := dd3668f65645fe270bc615d748bd4dc048bd17b9dc297025106e6ecc419ab95d
 DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-1
 DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
 QT_JAMI_PREFIX := /usr/lib/libqt-jami
@@ -166,11 +164,13 @@ DISTRIBUTIONS := \
 	debian_unstable \
 	ubuntu_20.04 \
 	ubuntu_22.04 \
-	ubuntu_23.04 \
-	ubuntu_23.10 \
+	ubuntu_24.04 \
+	ubuntu_24.10 \
 	fedora_37 \
 	fedora_38 \
 	fedora_39 \
+	fedora_40 \
+	fedora_41 \
 	alma_9 \
 	opensuse-leap_15.4 \
 	opensuse-leap_15.5 \
@@ -250,10 +250,11 @@ GUIX_PACK_FORMATS = deb rpm
 define guix-pack-command
 guix pack -C xz -f $(1) -m $(CURDIR)/extras/packaging/gnu-linux/guix/guix-pack-manifest.scm -v3 \
   -S /usr/bin/jami=bin/jami \
-  -S /usr/share/applications/jami.desktop=share/applications/jami.desktop \
+  -S /usr/share/applications/net.jami.Jami.desktop=share/applications/net.jami.Jami.desktop \
   -S /usr/share/icons/hicolor/scalable/apps/jami.svg=share/icons/hicolor/scalable/apps/jami.svg \
   -S /usr/share/icons/hicolor/48x48/apps/jami.png=share/icons/hicolor/48x48/apps/jami.png \
-  -S /usr/share/metainfo/jami.appdata.xml=share/metainfo/jami.appdata.xml \
+  -S /usr/share/metainfo/net.jami.Jami.metainfo.xml=share/metainfo/net.jami.Jami.metainfo.xml \
+  -S /usr/share/swcatalog/xml/jami.xml=share/swcatalog/xml/jami.xml \
   $(and $(findstring deb,$(1)), \
     --postinst-file=$(CURDIR)/extras/packaging/gnu-linux/guix/guix-pack-deb.postinst)
 endef

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
+# is unable to 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,9 +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
-ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
-RUN /opt/install-cmake.sh
+RUN apt-get remove -y libre2-dev libre2-11
 
 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/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
+# is unable to 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,9 +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
-ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
-RUN /opt/install-cmake.sh
+RUN apt-get remove -y libre2-dev libre2-11
 
 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/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_fedora_41

@@ -0,0 +1,103 @@
+FROM fedora:41
+
+RUN dnf clean all
+RUN dnf update -y
+
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+
+RUN dnf group install -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 \
+        clang18-devel \
+        llvm18-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 \
+        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

@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.5
 
-RUN zypper refresh
+RUN zypper --gpg-auto-import-keys refresh
 
 RUN zypper --non-interactive install -y \
         dnf \
@@ -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

@@ -1,10 +1,12 @@
-ARG RISK=edge
+# This file is based on the examples at the following links:
+#   https://snapcraft.io/docs/build-on-docker
+#   https://github.com/canonical/snapcraft/issues/5079#issuecomment-2414199613
+
 ARG UBUNTU=focal
 
-FROM ubuntu:$UBUNTU as builder
-ARG RISK
+FROM ubuntu:$UBUNTU AS builder
 ARG UBUNTU
-RUN echo "Building snapcraft:$RISK in ubuntu:$UBUNTU"
+RUN echo "Building snapcraft in ubuntu:$UBUNTU"
 
 # Grab dependencies
 RUN apt-get update
@@ -14,33 +16,23 @@ RUN apt-get install --yes \
       jq \
       squashfs-tools
 
-# Grab the core snap (for backwards compatibility) from the stable channel and
-# unpack it in the proper place.
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core' | jq '.download_url' -r) --output core.snap
-RUN mkdir -p /snap/core
-RUN unsquashfs -d /snap/core/current core.snap
-
-# Grab the core22 snap (which snapcraft uses as a base) from the stable channel
-# and unpack it in the proper place.
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core22?channel='$RISK | jq '.download_url' -r) --output core22.snap
+# Download and unpack the core22 snap
+RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core22' | jq '.download_url' -r) --output core22.snap
 RUN mkdir -p /snap/core22
 RUN unsquashfs -d /snap/core22/current core22.snap
 
-# Grab the core20 snap (which snapcraft uses as a base) from the stable channel
-# and unpack it in the proper place.
+# Download and unpack the core20 snap
 RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core20' | jq '.download_url' -r) --output core20.snap
 RUN mkdir -p /snap/core20
 RUN unsquashfs -d /snap/core20/current core20.snap
 
-# Grab the core20 snap (which snapcraft uses as a base) from the stable channel
-# and unpack it in the proper place.
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/lxd' | jq '.download_url' -r) --output lxd.snap
-RUN mkdir -p /snap/lxd
-RUN unsquashfs -d /snap/lxd/current lxd.snap
+# Download and unpack the core24 snap
+RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core24' | jq '.download_url' -r) --output core24.snap
+RUN mkdir -p /snap/core24
+RUN unsquashfs -d /snap/core24/current core24.snap
 
-# Grab the snapcraft snap from the $RISK channel and unpack it in the proper
-# place.
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel='$RISK | jq '.download_url' -r) --output snapcraft.snap
+# Download and unpack snapcraft
+RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft' | jq '.download_url' -r) --output snapcraft.snap
 RUN mkdir -p /snap/snapcraft
 RUN unsquashfs -d /snap/snapcraft/current snapcraft.snap
 
@@ -50,26 +42,30 @@ RUN unlink /snap/snapcraft/current/usr/bin/python3
 RUN ln -s /snap/snapcraft/current/usr/bin/python3.* /snap/snapcraft/current/usr/bin/python3
 RUN echo /snap/snapcraft/current/lib/python3.*/site-packages >> /snap/snapcraft/current/usr/lib/python3/dist-packages/site-packages.pth
 
-# Create a snapcraft runner (TODO: move version detection to the core of
-# snapcraft).
+# Create a snapcraft runner
 RUN mkdir -p /snap/bin
 RUN echo "#!/bin/sh" > /snap/bin/snapcraft
 RUN snap_version="$(awk '/^version:/{print $2}' /snap/snapcraft/current/meta/snap.yaml | tr -d \')" && echo "export SNAP_VERSION=\"$snap_version\"" >> /snap/bin/snapcraft
-RUN echo 'exec "$SNAP/usr/bin/python3" "$SNAP/bin/snapcraft" "$@"' >> /snap/bin/snapcraft
+RUN echo 'exec "/snap/snapcraft/current/bin/python3" -m snapcraft "$@"' >> /snap/bin/snapcraft
 RUN chmod +x /snap/bin/snapcraft
 
+
 # Multi-stage build, only need the snaps from the builder. Copy them one at a
 # time so they can be cached.
 FROM ubuntu:$UBUNTU
-COPY --from=builder /snap/core /snap/core
-COPY --from=builder /snap/core22 /snap/core22
+
 COPY --from=builder /snap/core20 /snap/core20
-COPY --from=builder /snap/lxd /snap/lxd
+COPY --from=builder /snap/core22 /snap/core22
+COPY --from=builder /snap/core24 /snap/core24
 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_24.04

@@ -1,4 +1,4 @@
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -10,6 +10,9 @@ RUN apt-get update && \
         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

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

@@ -1,4 +1,4 @@
-FROM ubuntu:23.04
+FROM ubuntu:24.10
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -18,5 +18,12 @@ 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
 
+# Remove the libre2-dev package in order to force Qt to build using the bundled
+# version of the RE2 library. This is necessary because the system version of the
+# library on Ubuntu 24.10 (libre2-11) is not compatible with the one used in
+# Qt 6.6.1 due to an API change:
+# https://codereview.qt-project.org/c/qt/qtwebengine/+/516094
+RUN apt-get remove -y libre2-dev libre2-11
+
 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/guix/guix-pack-deb.postinst

@@ -1,7 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2021-2024 Savoir-faire Linux Inc.
-#
-# Author: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
+# Copyright (C) 2021-2025 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

extras/packaging/gnu-linux/guix/guix-pack-manifest.scm

@@ -1,6 +1,4 @@
-;;; Copyright (C) 2021-2024 Savoir-faire Linux Inc.
-;;;
-;;; Author: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
+;;; Copyright (C) 2021-2025 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

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-qtwebengine-enable-building-with-Python-3.12.patch

@@ -0,0 +1,348 @@
+From 24fb774485f719df1e84dda31605d3f69202d69f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
+ <francois-simon.fauteux-chapleau@savoirfairelinux.com>
+Date: Thu, 8 Aug 2024 14:59:17 -0400
+Subject: [PATCH] qtwebengine: enable building with Python 3.12
+
+Replace the deprecated imp module by importlib:
+https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/524014
+https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/534568
+
+Update six to fix html5lib import failure:
+https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/535605
+https://issues.chromium.org/issues/40286977
+---
+ .../protobufs/binary_proto_generator.py          |  8 ++++++--
+ .../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 -----
+ .../third_party/catapult/third_party/six/six.py  | 16 ++++++++++++++++
+ 11 files changed, 29 insertions(+), 39 deletions(-)
+
+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 2a1802dccdc..8b9de65ed0b 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
++from importlib import util as imp_util
+ import optparse
+ import os
+ import re
+@@ -68,7 +68,11 @@ class GoogleProtobufModuleImporter:
+       raise ImportError(fullname)
+ 
+     filepath = self._fullname_to_filepath(fullname)
+-    return imp.load_source(fullname, filepath)
++    spec = imp_util.spec_from_file_location(fullname, filepath)
++    loaded = imp_util.module_from_spec(spec)
++    spec.loader.exec_module(loaded)
++
++    return loaded
+ 
+ class BinaryProtoGenerator:
+ 
+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 29daec367c5..124f12c134b 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 48eaf4eca94..c93d22898d2 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 76cda3981f3..7143e07c4d7 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 4259374513f..558e71e1193 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 c36376712e7..b289f7b11f6 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 5fc582025ee..2fa5d2be6ab 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 73ca15df94c..1083a1af7bb 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 ce376da66e0..bc9f8354316 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 0513343ec7e..0a26307b1a3 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/catapult/third_party/six/six.py b/qtwebengine/src/3rdparty/chromium/third_party/catapult/third_party/six/six.py
+index 83f69783d1a..5e7f0ce4437 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/catapult/third_party/six/six.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/catapult/third_party/six/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.34.1
+

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/0003-qtwayland-downgrade-wl-seat-to-avoid-high-resolution.patch

@@ -0,0 +1,26 @@
+From cf208d11dc8a9a02160a57283596ec8bab964a09 Mon Sep 17 00:00:00 2001
+From: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
+Date: Mon, 27 May 2024 16:01:21 -0400
+Subject: [PATCH] qtwayland: downgrade wl-seat to avoid high-resolution
+ scrolling events
+
+---
+ qtwayland/src/client/qwaylandinputdevice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtwayland/src/client/qwaylandinputdevice.cpp b/qtwayland/src/client/qwaylandinputdevice.cpp
+index a4f8757e3c..ad0aa7941c 100644
+--- a/qtwayland/src/client/qwaylandinputdevice.cpp
++++ b/qtwayland/src/client/qwaylandinputdevice.cpp
+@@ -383,7 +383,7 @@ QWaylandInputDevice::Touch::~Touch()
+ }
+ 
+ QWaylandInputDevice::QWaylandInputDevice(QWaylandDisplay *display, int version, uint32_t id)
+-    : QtWayland::wl_seat(display->wl_registry(), id, qMin(version, 9))
++    : QtWayland::wl_seat(display->wl_registry(), id, qMin(version, 7))
+     , mQDisplay(display)
+     , mDisplay(display->wl_display())
+ {
+-- 
+2.45.0
+

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/0004-qtbase-fix-CMake-error.patch

@@ -0,0 +1,40 @@
+From 420b3e5ac2e91b7a99488ac34577e2798a84a68c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
+ <francois-simon.fauteux-chapleau@savoirfairelinux.com>
+Date: Tue, 6 Aug 2024 17:35:56 -0400
+Subject: [PATCH] qtbase: fix CMake error
+
+For more information, see:
+https://github.com/qt/qtbase/commit/3411f2984a5325a35e3bed1f961e5973d8a565b9
+---
+ qtbase/configure.cmake            | 1 +
+ qtbase/src/corelib/CMakeLists.txt | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtbase/configure.cmake b/qtbase/configure.cmake
+index 43de2aa026..37a82dcdb6 100644
+--- a/qtbase/configure.cmake
++++ b/qtbase/configure.cmake
+@@ -18,6 +18,7 @@ if(TARGET ZLIB::ZLIB)
+     set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE)
+ endif()
+ 
++qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
+ qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME core)
+ # openssl_headers
+ # OPENSSL_VERSION_MAJOR is not defined for OpenSSL 1.1.1
+diff --git a/qtbase/src/corelib/CMakeLists.txt b/qtbase/src/corelib/CMakeLists.txt
+index 31b81734e8..b62e2f763b 100644
+--- a/qtbase/src/corelib/CMakeLists.txt
++++ b/qtbase/src/corelib/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ # Copyright (C) 2022 The Qt Company Ltd.
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
+-qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
+ qt_find_package(WrapPCRE2 PROVIDED_TARGETS WrapPCRE2::WrapPCRE2)
+ qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
+ 
+-- 
+2.34.1
+

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/0005-qtwebengine-add-missing-chromium-dependencies.patch

@@ -0,0 +1,40 @@
+From 4c7360faeb0fb7f1dfd995619fb8c596b4e15606 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
+ <francois-simon.fauteux-chapleau@savoirfairelinux.com>
+Date: Thu, 8 Aug 2024 10:29:43 -0400
+Subject: [PATCH] qtwebengine: add missing chromium dependencies
+
+For more information, see:
+https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/555586
+---
+ chromium/content/public/browser/BUILD.gn                         | 1 +
+ chromium/extensions/browser/api/declarative_net_request/BUILD.gn | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn b/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
+index b25bf5764e7..dfbfb2ec77b 100644
+--- a/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
++++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
+@@ -515,6 +515,7 @@ jumbo_source_set("browser_sources") {
+     "//cc",
+     "//components/services/storage/public/cpp",
+     "//components/viz/host",
++    "//components/spellcheck:buildflags",
+     "//content/browser",  # Must not be public_deps!
+     "//device/fido",
+     "//gpu",
+diff --git a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+index 1fc492f5a0c..13a266e22f1 100644
+--- a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
++++ b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+@@ -23,6 +23,7 @@ source_set("declarative_net_request") {
+     "//extensions/common",
+     "//extensions/common/api",
+     "//services/preferences/public/cpp",
++    "//components/web_cache/browser",
+   ]
+ 
+   public_deps = [ "//extensions/browser:browser_sources" ]
+-- 
+2.34.1
+

extras/packaging/gnu-linux/rules/debian-qt/patches/0006-qtwebengine-fix-libxml2-build-error.patch

@@ -0,0 +1,49 @@
+From ab6d5bebaf68a9f4d00440b2adbaffe0e5b2ae6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
+ <francois-simon.fauteux-chapleau@savoirfairelinux.com>
+Date: Thu, 8 Aug 2024 10:55:08 -0400
+Subject: [PATCH] qtwebengine: fix libxml2 build error
+
+Version 2.12 of libxml2 introduced a change that broke chromium's build,
+see: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/523633
+---
+ .../third_party/blink/renderer/core/xml/xslt_processor.h     | 5 +++++
+ .../blink/renderer/core/xml/xslt_processor_libxslt.cc        | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
+index d53835e9675..72536e4fd7d 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
+@@ -77,7 +77,12 @@ class XSLTProcessor final : public ScriptWrappable {
+ 
+   void reset();
+ 
++#if LIBXML_VERSION >= 21200
++  static void ParseErrorFunc(void* user_data, const xmlError*);
++#else
+   static void ParseErrorFunc(void* user_data, xmlError*);
++#endif
++
+   static void GenericErrorFunc(void* user_data, const char* msg, ...);
+ 
+   // Only for libXSLT callbacks
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+index 133e0b3355d..e8e6a09f485 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+@@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) {
+   // It would be nice to do something with this error message.
+ }
+ 
++#if LIBXML_VERSION >= 21200
++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
++#else
+ void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
++#endif
+   FrameConsole* console = static_cast<FrameConsole*>(user_data);
+   if (!console)
+     return;
+-- 
+2.34.1
+

extras/packaging/gnu-linux/rules/debian-qt/patches/0007-qtwebengine-fix-v8-build-error.patch

@@ -0,0 +1,34 @@
+From 6e0848a1c51c6494e3b7410c5fe38941d48fcb36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
+ <francois-simon.fauteux-chapleau@savoirfairelinux.com>
+Date: Wed, 16 Oct 2024 22:32:12 -0400
+Subject: [PATCH] qtwebengine: fix v8 build error
+
+In file included from ../../../3rdparty/chromium/v8/src/heap/cppgc/sweeper.h:14,
+                 from ./../../../3rdparty/chromium/v8/src/heap/cppgc/sweeper.cc:5,
+                 from gen/v8/cppgc_base_jumbo_7.cc:5:
+../../../3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h: In member function 'void cppgc::internal::StatsCollector::ForAllAllocationObservers(Callback)':
+../../../3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h:401:48: error: cannot convert 'std::vector&lt;cppgc::internal::StatsCollector::AllocationObserver*&gt;::iterator' to 'const char*'
+  401 |         std::remove(allocation_observers_.begin(), allocation_observers_.end(),
+      |                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
+      |                                                |
+      |                                                std::vector&lt;cppgc::internal::StatsCollector::AllocationObserver*&gt;::iterator
+---
+ .../src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h    | 1 +
+ 1 file changed, 1 insertion(+)
+
+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>
+ 
+-- 
+2.47.0
+

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,7 @@
-0001-fix-mathops.patch
+0001-qtwebengine-enable-building-with-Python-3.12.patch
 0002-fix-binary-tokenizer.patch
-0015-remove-deleted-xkb-keys.patch
-0016-fix-vaapi.patch
+0003-qtwayland-downgrade-wl-seat-to-avoid-high-resolution.patch
+0004-qtbase-fix-CMake-error.patch
+0005-qtwebengine-add-missing-chromium-dependencies.patch
+0006-qtwebengine-fix-libxml2-build-error.patch
+0007-qtwebengine-fix-v8-build-error.patch

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

@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 9),
                libpulse-dev,
                libasound2-dev,
                libexpat1-dev,
-               libpcre3-dev,
+               libpcre3-dev | libpcre2-dev,
                libyaml-cpp-dev,
                libboost-dev,
                libxext-dev,
@@ -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/copyright

@@ -3,7 +3,7 @@ Upstream-Name: jami
 Upstream-Contact: Amin Bandali <bandali@gnu.org>
 Source: https://dl.jami.net/release/tarballs/
 Files: *
-Copyright: 2004-2024 Savoir-faire Linux Inc.
+Copyright: 2004-2025 Savoir-faire Linux Inc.
 License: GPL-3+
 Comment: Upstream embeds everything that is needed to build Jami inside the release tarball.
  Everything that is already in Debian has been removed.

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

@@ -99,10 +99,10 @@ if [ -f /etc/os-release ]; then
         ENDTAG="ubuntu_20.04"
     elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then
         ENDTAG="ubuntu_22.04"
-    elif [ "${UBUNTU_CODENAME}" = "lunar" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.04" ]; 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 [ "${UBUNTU_CODENAME}" = "oracular" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_24.10" ]; then
+        ENDTAG="ubuntu_24.10"
     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,8 @@ 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
+Patch1:        0002-qtwebengine-add-missing-chromium-dependencies.patch
 
 %global gst 0.10
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -65,10 +66,8 @@ This package contains Qt libraries for Jami.
 
 %prep
 %setup -n qt-everywhere-src-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
 
 %build
 echo "Building Qt using %{job_count} parallel jobs"

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

@@ -2,6 +2,19 @@
 %define version     RELEASE_VERSION
 %define release     0
 
+# The AppStream 1.0 spec says that the catalog file must be put in /usr/share/swcatalog/xml
+# (see https://www.freedesktop.org/software/appstream/docs/chap-CatalogData.html).
+#
+# However, openSUSE Leap still uses the legacy path /usr/share/app-info/xmls as of version 15.5.
+%if 0%{?sle_version} &&  0%{?sle_version} <= 150500
+%define appstream_catalog_dir /share/app-info/xmls
+%else
+%define appstream_catalog_dir /share/swcatalog/xml
+%endif
+
+# Exclude vendored Qt6 from dependency generator
+%define __requires_exclude ^libQt6.*$
+
 Name:          %{name}
 Version:       %{version}
 Release:       %{release}%{?dist}
@@ -66,6 +79,7 @@ cd %{_builddir}/jami-%{version} && \
           -DLIBJAMI_BUILD_DIR=%{_builddir}/jami-%{version}/daemon/src \
           -DCMAKE_INSTALL_PREFIX=%{_prefix} \
           -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+          -DAPPSTREAM_CATALOG_DIR=%{appstream_catalog_dir} \
           -DWITH_DAEMON_SUBMODULE=true \
           -DCMAKE_BUILD_TYPE=Release \
           ..
@@ -77,11 +91,12 @@ DESTDIR=%{buildroot} make -C %{_builddir}/jami-%{version}/build install V=2
 %files
 %defattr(-,root,root,-)
 %{_bindir}/jami
-%{_datadir}/applications/jami.desktop
-%{_datadir}/jami/jami.desktop
+%{_datadir}/applications/net.jami.Jami.desktop
+%{_datadir}/jami/net.jami.Jami.desktop
 %{_datadir}/icons/hicolor/scalable/apps/jami.svg
 %{_datadir}/icons/hicolor/48x48/apps/jami.png
 %{_datadir}/pixmaps/jami.xpm
-%{_datadir}/metainfo/jami.appdata.xml
+%{_datadir}/metainfo/net.jami.Jami.metainfo.xml
+%{_prefix}%{appstream_catalog_dir}/jami.xml
 %{_datadir}/jami/translations/*
 %doc %{_mandir}/man1/jami*

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/0002-qtwebengine-add-missing-chromium-dependencies.patch

@@ -0,0 +1,40 @@
+From 04778c7f54c8a1a0e7fced75c5ef39ced82cece1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
+ <francois-simon.fauteux-chapleau@savoirfairelinux.com>
+Date: Sat, 12 Oct 2024 16:21:35 -0400
+Subject: [PATCH] qtwebengine: add missing chromium dependencies
+
+For more information, see:
+https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/555586
+---
+ chromium/content/public/browser/BUILD.gn                         | 1 +
+ chromium/extensions/browser/api/declarative_net_request/BUILD.gn | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn b/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
+index b25bf5764e7..dfbfb2ec77b 100644
+--- a/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
++++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
+@@ -515,6 +515,7 @@ jumbo_source_set("browser_sources") {
+     "//cc",
+     "//components/services/storage/public/cpp",
+     "//components/viz/host",
++    "//components/spellcheck:buildflags",
+     "//content/browser",  # Must not be public_deps!
+     "//device/fido",
+     "//gpu",
+diff --git a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+index 1fc492f5a0c..13a266e22f1 100644
+--- a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
++++ b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+@@ -23,6 +23,7 @@ source_set("declarative_net_request") {
+     "//extensions/common",
+     "//extensions/common/api",
+     "//services/preferences/public/cpp",
++    "//components/web_cache/browser",
+   ]
+ 
+   public_deps = [ "//extensions/browser:browser_sources" ]
+-- 
+2.47.0
+

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

@@ -1,7 +1,4 @@
-# Copyright (C) 2019-2024 Savoir-faire Linux Inc.
-#
-# Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
-# Author: Amin Bandali <amin.bandali@savoirfairelinux.com>
+# Copyright (C) 2019-2025 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
@@ -51,37 +48,53 @@ icon: common/icons/jami.svg
 license: GPL-3.0+
 summary: 'Privacy-oriented voice, video, chat, and conference platform and SIP phone'
 description: |
-  Jami is free software for universal communication that respects the
-  freedom and privacy of its users.
+  Jami, a GNU package, is software for universal and distributed peer-to-peer communication that respects the freedom and privacy of its users.
 
-  Jami is an end-to-end encrypted secure and distributed voice, video,
-  and chat communication platform.  Jami requires no central server
-  for these communications and leaves the power of privacy and freedom
-  in the hands of users.
+  Jami is the simplest and easiest way to connect with people (and devices) with instant messaging, audio and video calls over the Internet and LAN/WAN intranets.
 
-  Jami provides the following key features to its users:
+  Jami is a free/libre, end-to-end encrypted, and private communication platform.
 
-  * Synchronized and enriched one-to-one conversations
-  * Group conversations (Beta)
-  * Audio/video calls and conferences
-  * Screen sharing in video calls and conferences
-  * Unlimited peer-to-peer file sharing
-  * Recording and sending audio/video messages
-  * Jami plugins SDK for additional functionality (green screen,
-    watermark, audio filters, and more)
-  * Use Jami as your SIP phone with a variety of media codecs
-    and VoIP providers
+  Jami – which used to be known as Ring – is also an open-source alternative (to Facebook Messenger, Signal, Skype, Teams, Telegram, TikTok, Viber, WhatsApp, Zoom) that prioritizes the privacy of its users.
 
-  Client applications for GNU/Linux, Windows, macOS, iOS, Android,
-  and Android TV are available, making Jami an interoperable and
-  cross-platform communication framework.
+  Jami has a professional-looking design and is available for a wide range of platforms. Unlike the alternatives, calls using Jami are directly between users as it does not use servers to handle calls.
 
-  Seamlessly deploy Jami in your organization using
-  Jami Account Management Server (JAMS).   With JAMS, you can enable
-  your users to connect using their LDAP/ActiveDirectory credentials
-  or create local accounts, enabling you to manage your own
-  Jami community while taking advantage of Jami's distributed network
-  architecture.  For more information, please visit https://jami.biz.
+  This gives the greatest privacy as the distributed nature of Jami means your calls are only between participants.
+
+  One-to-one and group conversations with Jami are enhanced with: instant messaging; audio and video calling; recording and sending audio and video messages; file transfers; screen sharing; and, location sharing.
+
+  Jami can also function as a SIP client.
+
+  Jami has multiple extensions available: Audio Filter; Auto Answer; Green Screen; Watermark; and, Whisper Transcript.
+
+  Jami can be easily deployed in organizations with the “Jami Account Management Server” (JAMS), allowing users to connect with their corporate credentials or create local accounts. JAMS allows you to manage your own Jami community while taking advantage of Jami’s distributed network architecture.
+
+  Jami is available for GNU/Linux, Windows, macOS, iOS, Android, and Android TV, making Jami an interoperable and cross-platform communication framework.
+
+  Manage multiple SIP accounts, Jami accounts and JAMS accounts with the Jami client installed on one or multiple devices.
+
+  Jami is free, unlimited, private, advertising free, compatible, fast, autonomous, and anonymous.
+
+  Learn more about:
+  Jami: https://jami.net/
+  Jami extensions: https://jami.net/extensions/
+  “Jami Account Management Server” (JAMS): https://jami.biz/
+  Jami documentation: https://docs.jami.net/
+
+  Follow us for more:
+  Mastodon: https://mstdn.io/@Jami
+  X: https://x.com/jami_social
+  YouTube: https://www.youtube.com/@jami9311
+
+  We’d love to hear from you! Join the Jami community:
+  Contribute: https://jami.net/contribute/
+  Forum: https://forum.jami.net/
+
+  Build with Jami on your IoT project: re-use the universal communications technology of Jami with its portable library on your system of choice.
+
+  Jami for Android TV is tested on NVIDIA SHIELD TV with Logitech cameras.
+
+  Jami is published under the GPL license, version 3 or higher.
+  Copyright © Savoir-faire Linux Inc.
 
 confinement: strict
 grade: stable
@@ -135,9 +148,13 @@ apps:
     - bin/desktop-launch
     - snap/command-chain/alsa-launch
     - bin/jami-wrapper
-    autostart: jami.desktop
+    autostart: net.jami.Jami.desktop
     common-id: net.jami.Jami
-    desktop: usr/share/applications/jami.desktop
+    desktop: usr/share/applications/net.jami.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
@@ -168,7 +185,7 @@ package-repositories:
     components: [main]
     suites: [jami]
     key-id: A295D773307D25A33AE72F2F64CD5FA175348F84
-    url: https://dl.jami.net/nightly/ubuntu_20.04/
+    url: https://dl.jami.net/internal/ubuntu_20.04/
 
 parts:
   desktop-launch:
@@ -238,7 +255,7 @@ parts:
     after: [alsa-mixin]
     source: .
     plugin: nil
-    parse-info: [usr/share/metainfo/jami.appdata.xml]
+    parse-info: [usr/share/metainfo/net.jami.Jami.metainfo.xml]
     stage:
       - -usr/lib/x86_64-linux-gnu/liblber-2.4.so*
       - -usr/lib/x86_64-linux-gnu/libldap_r-2.4.so*
@@ -253,8 +270,10 @@ parts:
       ls
       snapcraftctl pull
       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
+      sed -i -E 's|^Icon=.*|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/jami.svg|' extras/data/net.jami.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
@@ -319,6 +338,12 @@ parts:
     - libgnutls28-dev # TLS
     - gnutls-bin
     - libssl-dev
+    - git            # PipeWire build dependencies
+    - libasound2-dev #
+    - libdbus-1-dev  # These packages are needed by the
+    - libglib2.0-dev # install-pipewire-from-source.sh
+    - ninja-build    # script in order to build PipeWire
+    - pkg-config     # from source.
     stage-packages:
     - libgnutls30
     - libavutil56

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2016-2024 Savoir-faire Linux Inc.
+# Copyright (C) 2016-2025 Savoir-faire Linux Inc.
 #
 # Author: Alexandre Viau <alexandre.viau@savoirfairelinux.com>
 # Author: Amin Bandali <amin.bandali@savoirfairelinux.com>
@@ -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

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2016-2024 Savoir-faire Linux Inc.
-#
-# Author: Alexandre Viau <alexandre.viau@savoirfairelinux.com>
-# Author: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
+# Copyright (C) 2016-2025 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
@@ -35,7 +32,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 +40,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 +50,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 +109,10 @@ 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}" == "fedora_41" ]]; then
+            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc41.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/build-package-snap.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2020-2024 Savoir-faire Linux Inc.
-#
-# Author: Amin Bandali <amin.bandali@savoirfairelinux.com>
+# Copyright (C) 2020-2025 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

extras/packaging/gnu-linux/scripts/deploy-packages.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2016-2024 Savoir-faire Linux Inc.
-#
-# Author: Alexandre Viau <alexandre.viau@savoirfairelinux.com>
-# Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+# Copyright (C) 2016-2025 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

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,35 @@
+#!/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
+
+# 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/gnu-linux/scripts/prebuild-package-debian.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2021-2024 Savoir-faire Linux Inc.
-#
-# Author: Amin Bandali <amin.bandali@savoirfairelinux.com>
+# Copyright (C) 2021-2025 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

extras/packaging/gnu-linux/scripts/release-version.sh

@@ -1,8 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2024 Savoir-faire Linux Inc.
-#
-# Author: Amin Bandali <amin.bandali@savoirfairelinux.com>
+# Copyright (C) 2024-2025 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

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/0002-workaround-right-margin.patch

@@ -1,34 +0,0 @@
-From ca2be6466c150d1b82a646d97b27df35b45d90f1 Mon Sep 17 00:00:00 2001
-From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
-Date: Tue, 9 Jan 2024 15:25:19 -0500
-Subject: [PATCH] workaround right margin
-
----
- src/core/contexts/win32windowcontext.cpp | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
-index 3f6623e..9ee7752 100644
---- a/src/core/contexts/win32windowcontext.cpp
-+++ b/src/core/contexts/win32windowcontext.cpp
-@@ -402,6 +402,17 @@ namespace QWK {
-                     return true;
-                 }
-             }
-+
-+#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
-+            if (msg->message == WM_MOVE || msg->message == WM_SIZE ||
-+                (msg->message == WM_IME_SETCONTEXT && (GetForegroundWindow() == msg->hwnd))) {
-+                static const auto flags = SWP_FRAMECHANGED | SWP_NOMOVE |
-+                                          SWP_NOSIZE | SWP_NOZORDER |
-+                                          SWP_NOOWNERZORDER;
-+                SetWindowPos(msg->hwnd, NULL, 0, 0, 0, 0, flags);
-+            }
-+#endif
-+
-             return false;
-         }
-
---
-2.7.4
-

extras/scripts/build-windows.py

@@ -9,14 +9,15 @@ and package the project for Windows.
 usage: build.py [-q] [-h] [-a ARCH] [-c CONFIG] [-t] [-i] [-v] {pack} ...
 
 optional arguments:
-  -q, --qt PATH         Sets the Qt installation path
-  -a ARCH, --arch ARCH  Sets the build architecture
+  -q, --qt PATH             Sets the Qt installation path
+  -a ARCH, --arch ARCH      Sets the build architecture
   -c CONFIG, --config CONFIG
-                        Sets the build configuration type
-  -t, --tests           Build and run tests
-  -i, --init            Initialize submodules
-  -v, --version         Show the version number and exit
-  -s, --skip-build      Only do packaging or run tests, skip building
+                            Sets the build configuration type
+  -t, --tests               Build and run tests
+  -i, --init                Initialize submodules
+  -v, --version             Show the version number and exit
+  -s, --skip-build          Only do packaging or run tests, skip building
+  --enable-crash-reports    Enable crash reports
 
 positional arguments:
   {pack}
@@ -28,7 +29,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
@@ -260,7 +261,7 @@ def cmake_build(config_str, env_vars, cmake_build_dir):
     return True
 
 
-def build(config_str, qt_dir, tests):
+def build(config_str, qt_dir, tests, enable_crash_reports, crash_report_url=None):
     """Use cmake to build the project."""
     print("Building with Qt at " + qt_dir)
 
@@ -280,10 +281,17 @@ 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"]),
     ]
 
+    if enable_crash_reports:
+        cmake_options.append("-DENABLE_CRASHREPORTS=ON")
+        if crash_report_url:
+            cmake_options.append(f"-DCRASH_REPORT_URL={crash_report_url}")
+    else:
+        cmake_options.append("-DENABLE_CRASHREPORTS=OFF")
+
     # Make sure the build directory exists.
     if not os.path.exists(build_dir):
         os.makedirs(build_dir)
@@ -341,8 +349,8 @@ def deploy_runtimes(config_str, qt_dir):
     install_file("resources/images/jami.ico", repo_root_dir)
 
     # windeployqt
-    print("Running windeployqt (this may take a while)...")
     win_deploy_qt = os.path.join(qt_dir, "bin", "windeployqt.exe")
+    print(f"Running windeployqt ({win_deploy_qt}) (this may take a while)...")
     qml_src_dir = os.path.join(repo_root_dir, "src", "app")
     installation_dir = get_vs_prop("installationPath")
     if not installation_dir:
@@ -471,17 +479,24 @@ def parse_args():
     parser.add_argument(
         "-i", "--init", action="store_true", help="Initialize submodules")
     parser.add_argument(
-        '-sd',
         '--skip-deploy',
         action='store_true',
         default=False,
         help='Force skip deployment of runtime files needed for packaging')
     parser.add_argument(
-        "-sb",
         "--skip-build",
         action="store_true",
         default=False,
         help="Only do packaging or run tests, skip build step")
+    parser.add_argument(
+        '--enable-crash-reports',
+        action='store_true',
+        default=False,
+        help='Enable crash reporting')
+    parser.add_argument(
+        '--crash-report-url',
+        help='Override the crash report submission URL',
+        default=None)
 
     pack_arg_parser = subparsers.add_parser("pack")
     pack_group = pack_arg_parser.add_mutually_exclusive_group(required=True)
@@ -534,7 +549,9 @@ def main():
 
     def do_build(do_tests):
         if not parsed_args.skip_build:
-            build(config_str, parsed_args.qt, do_tests)
+            build(config_str, parsed_args.qt, do_tests,
+                  parsed_args.enable_crash_reports,
+                  parsed_args.crash_report_url)
         if not parsed_args.skip_deploy:
             deploy_runtimes(config_str, parsed_args.qt)
 

extras/scripts/build_daemon_macos.sh

@@ -99,6 +99,12 @@ for ARCH in "${ARCHS[@]}"; do
   echo "$ARCH"
   cd "$DAEMON"
   HOST="${ARCH}-apple-darwin"
+  SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
+
+  CC="xcrun -sdk macosx clang"
+  CXX="xcrun -sdk macosx clang++"
+  CFLAGS="-arch $ARCH -isysroot $SDKROOT"
+  CXXFLAGS="-std=c++17 $CFLAGS"
   CONFIGURE_FLAGS=" --without-dbus --host=${HOST} -with-contrib=$DAEMON/contrib/${ARCH}-apple-darwin${OS_VER} --prefix=${INSTALL}/daemon/$ARCH"
 
   if [ "${debug}" = "true" ]; then
@@ -113,7 +119,11 @@ for ARCH in "${ARCHS[@]}"; do
   mkdir -p "build-macos-${ARCH}"
   cd "build-macos-${ARCH}"
 
-  "$DAEMON"/configure $CONFIGURE_FLAGS ARCH="$ARCH" || exit 1
+  "$DAEMON"/configure $CONFIGURE_FLAGS ARCH="$ARCH" \
+    CC="$CC $CFLAGS" \
+    CXX="$CXX $CXXFLAGS" \
+    CFLAGS="$CFLAGS" \
+    CXXFLAGS="$CXXFLAGS" || exit 1
 
   echo "$CONFIGURE_FLAGS"
 

extras/scripts/build_qrencode.sh

@@ -1,61 +1,89 @@
 #!/usr/bin/env bash
+set -e
 
-# Flags:
-
-# -a: architecture to build. Accepted values arm64, x86_64, unified
+# Usage:
+# ./build_qrencode.sh -a <architecture>
+# Accepted architectures: arm64, x86_64, unified
+# If no architecture is specified, the script builds for the host architecture.
 
+# Initialize variables
 arch=''
 while getopts "a:" OPT; do
   case "$OPT" in
-  a)
-    arch="${OPTARG}"
-    ;;
-  \?)
-    exit 1
-    ;;
+    a)
+      arch="${OPTARG}"
+      ;;
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      echo "Usage: $0 [-a architecture]"
+      echo "Accepted architectures: arm64, x86_64, unified"
+      exit 1
+      ;;
   esac
 done
 
+# Determine architectures to build
 if [[ "$arch" == 'unified' ]]; then
   ARCHS=("arm64" "x86_64")
 elif [[ "$arch" == '' ]]; then
-  ARCHS=("arm64")
+  # Detect host architecture
+  HOST_ARCH=$(uname -m)
+  case "$HOST_ARCH" in
+    x86_64|arm64)
+      ARCHS=("$HOST_ARCH")
+      ;;
+    *)
+      echo "Unsupported host architecture: $HOST_ARCH"
+      echo "Supported architectures are: arm64, x86_64, unified"
+      exit 1
+      ;;
+  esac
 else
-  ARCHS=("$arch")
+  # Validate specified architecture
+  case "$arch" in
+    x86_64|arm64)
+      ARCHS=("$arch")
+      ;;
+    *)
+      echo "Invalid architecture specified: $arch"
+      echo "Accepted architectures are: arm64, x86_64, unified"
+      exit 1
+      ;;
+  esac
 fi
 
 TOP="$(pwd)"
 QRENCODEDIR="${TOP}/3rdparty/libqrencode"
-if [ -z "$NPROC" ]; then
-  NPROC=$(sysctl -n hw.ncpu || echo -n 1)
-fi
+BUILDDIR="${QRENCODEDIR}/build-libqrencode"
+LIBDIR="${QRENCODEDIR}/lib"
+INCLUDEDIR="${QRENCODEDIR}/include"
 
-for ARCH in "${ARCHS[@]}"; do
-  cd "$QRENCODEDIR" || exit 1
-  BUILDDIR="$ARCH-libqrencode"
-  mkdir "$BUILDDIR"
-  make clean
-  ./autogen.sh
-  ./configure --host="$ARCH" --without-png --prefix="${QRENCODEDIR}/${BUILDDIR}" CFLAGS=" -arch $ARCH $CFLAGS"
-  make -j"$NPROC"
-  make install
-done
-mkdir -p "$QRENCODEDIR"/lib
-mkdir -p "$QRENCODEDIR"/include
+# Clean up build directory
+echo "Preparing clean build directory"
+rm -rf "$BUILDDIR"
+mkdir -p "$BUILDDIR"
 
-if ((${#ARCHS[@]} == "2")); then
-  echo "Making fat lib for ${ARCHS[0]} and ${ARCHS[1]}"
-  LIBFILES="$QRENCODEDIR/${ARCHS[0]}-libqrencode/lib/*.a"
-  for f in $LIBFILES; do
-    libFile=${f##*/}
-    echo "$libFile"
-    lipo -create "$QRENCODEDIR/${ARCHS[0]}-libqrencode/lib/$libFile" \
-      "$QRENCODEDIR/${ARCHS[1]}-libqrencode/lib/$libFile" \
-      -output "${QRENCODEDIR}/lib/$libFile"
-  done
-else
-  echo "No need for fat lib"
-  rsync -ar --delete "$QRENCODEDIR/${ARCHS[0]}-libqrencode/lib/"*.a "${QRENCODEDIR}/lib/"
-fi
+# Clean output directories
+rm -rf "$LIBDIR" "$INCLUDEDIR"
+mkdir -p "$LIBDIR"
+mkdir -p "$INCLUDEDIR"
 
-rsync -ar --delete "$QRENCODEDIR/${ARCHS[0]}-libqrencode/include/"* "${QRENCODEDIR}/include/"
+# Convert architectures to semicolon-separated format for cmake
+ARCHS_SEMICOLON_SEPARATED=$(IFS=";"; echo "${ARCHS[*]}")
+
+echo "Configuring CMake for architectures: ${ARCHS[*]}"
+cd "$BUILDDIR"
+cmake "$QRENCODEDIR" \
+  -DCMAKE_OSX_ARCHITECTURES="$ARCHS_SEMICOLON_SEPARATED" \
+  -DCMAKE_INSTALL_PREFIX="$QRENCODEDIR" \
+  -DWITHOUT_PNG=ON \
+  -DBUILD_SHARED_LIBS=OFF \
+  -G "Xcode"
+
+echo "Building libqrencode for architectures: ${ARCHS[*]}"
+cmake --build . --config Release
+
+echo "Installing libqrencode to $LIBDIR and $INCLUDEDIR"
+cmake --install . --config Release
+
+echo "Build and installation completed successfully, with outputs in $LIBDIR and $INCLUDEDIR."

extras/scripts/format.py

@@ -139,14 +139,14 @@ def main():
 
     if args.type in ["cpp", "both"]:
         if command_exists("clang-format-" + CFVERSION):
-            CLANGFORMAT = "clang-format-" + CFVERSION   
+            CLANGFORMAT = "clang-format-" + CFVERSION
         elif command_exists("clang-format"):
-            CLANGFORMAT = "clang-format"     
+            CLANGFORMAT = "clang-format"
 
     if CLANGFORMAT is not None:
         print("Using source formatter: " + CLANGFORMAT)
     else:
-        print("clang-format not found. can't format source files")
+        print("clang-format not found, unable to format source files")
 
     if args.qt is not None and args.type in ["qml", "both"]:
         global QMLFORMAT  # pylint: disable=global-statement
@@ -154,7 +154,7 @@ def main():
         if QMLFORMAT is not None:
             print("Using qmlformatter: " + QMLFORMAT)
         else:
-            print("qmlformat not found, can't format QML files")
+            print("qmlformat not found, unable to format QML files")
 
     if args.install:
         if CLANGFORMAT is not None or QMLFORMAT is not None:
@@ -171,10 +171,10 @@ def main():
         exit_if_no_files()
     else:
         if src_files and args.type in ["cpp", "both"] and CLANGFORMAT:
-            print("Formatting source files...")
+            print("Formatting source files…")
             clang_format_files(src_files)
         if qml_files and args.type in ["qml", "both"] and QMLFORMAT:
-            print("Formatting QML files...")
+            print("Formatting QML files…")
             qml_format_files(qml_files)