Merge branch 'master' into refac-database

Krzmbrzl · Feb 15, 2025 · d8ce8ac · d8ce8ac
2 parents 8101854 + 91ab126
commit d8ce8ac
Show file tree

Hide file tree

Showing 911 changed files with 42,179 additions and 14,990 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
@@ -12,7 +12,7 @@ environment:
   global:
     MUMBLE_BUILD_NUMBER_TOKEN:
       secure: scRizsdwbTWjY7M9RHPT9EXDBxtWvXTsyVq1xXTWF1A=
-    MUMBLE_ENVIRONMENT_SOURCE: 'https://github.com/mumble-voip/vcpkg/releases/download/2024-05/'
+    MUMBLE_ENVIRONMENT_SOURCE: 'https://github.com/mumble-voip/vcpkg/releases/download/2025-02/'
     MUMBLE_ENVIRONMENT_STORE: 'C:/MumbleBuild'
     MUMBLE_ENVIRONMENT_PATH: '%MUMBLE_ENVIRONMENT_STORE%/%MUMBLE_ENVIRONMENT_VERSION%'
     MUMBLE_ENVIRONMENT_TOOLCHAIN: '%MUMBLE_ENVIRONMENT_PATH%/scripts/buildsystems/vcpkg.cmake'
@@ -22,8 +22,8 @@ environment:
     MUMBLE_USE_ELEVATION: 'ON'
 
   matrix:
-    - MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
-      MUMBLE_ENVIRONMENT_VERSION: ' mumble_env.x64-windows-static-md-release.2024-05-19.5eaf0d45f'
+    - MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md.2025-02-08.4d858462ac'
 
 install:
   - ps: .ci/install-environment_windows.ps1

diff --git a/.ci/azure-pipelines/assertNoTranslationChanges.sh b/.ci/azure-pipelines/assertNoTranslationChanges.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/checkDocs.bash b/.ci/azure-pipelines/checkDocs.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/extractWithProgress.bash b/.ci/azure-pipelines/extractWithProgress.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/install-environment_linux.bash b/.ci/azure-pipelines/install-environment_linux.bash
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
@@ -12,10 +12,12 @@ sudo apt -y install \
 	g++-multilib \
 	ninja-build \
 	pkg-config \
-	qtbase5-dev \
-	qttools5-dev \
-	qttools5-dev-tools \
-	libqt5svg5-dev \
+	qt6-base-dev \
+	qt6-l10n-tools \
+	qt6-tools-dev \
+	qt6-tools-dev-tools \
+	libqt6svg6-dev \
+	libgl-dev \
 	libboost-dev \
 	libssl-dev \
 	libprotobuf-dev \
@@ -58,4 +60,4 @@ sudo systemctl start postgresql.service
 
 echo "CREATE DATABASE mumble_test_db; "\
 	"CREATE USER mumble_test_user ENCRYPTED PASSWORD 'MumbleTestPassword'; "\
-	"GRANT ALL PRIVILEGES ON DATABASE mumble_test_db TO mumble_test_user;" | sudo -u postgres psql
+	"ALTER DATABASE mumble_test_db OWNER TO mumble_test_user;" | sudo -u postgres psql
diff --git a/.ci/azure-pipelines/install-environment_linux_translations.bash b/.ci/azure-pipelines/install-environment_linux_translations.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/install-environment_macos.bash b/.ci/azure-pipelines/install-environment_macos.bash
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
@@ -58,10 +58,12 @@ echo "Configuring PostgreSQL..."
 
 # Using brew service start postgresql for some reason does not work so we have
 # to resort to starting PostgreSQL manually.
-postgres_data_dir="$( brew info postgresql | grep -E '^ *initdb' | awk '{print $NF}' )"
-pg_ctl start -D "$postgres_data_dir"
+brew info postgresql
+ brew services start postgresql
+#postgres_data_dir="$( brew info postgresql | grep -E '^ *initdb' | awk '{print $NF}' )"
+#pg_ctl start -D "$postgres_data_dir"
 
 echo "CREATE DATABASE mumble_test_db; "\
 	"CREATE USER mumble_test_user ENCRYPTED PASSWORD 'MumbleTestPassword'; "\
-	"GRANT ALL PRIVILEGES ON DATABASE mumble_test_db TO mumble_test_user;" | psql -d postgres
+	"ALTER DATABASE mumble_test_db OWNER TO mumble_test_user;" | psql -d postgres
 
diff --git a/.ci/azure-pipelines/main-pr.yml b/.ci/azure-pipelines/main-pr.yml
@@ -1,11 +1,11 @@
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
 variables:
   MUMBLE_ENVIRONMENT_STORE: '$(Agent.ToolsDirectory)/MumbleBuild'
-  MUMBLE_ENVIRONMENT_SOURCE: 'https://github.com/mumble-voip/vcpkg/releases/download/2024-05/'
+  MUMBLE_ENVIRONMENT_SOURCE: 'https://github.com/mumble-voip/vcpkg/releases/download/2025-02/'
   MUMBLE_ENVIRONMENT_PATH: '$(MUMBLE_ENVIRONMENT_STORE)/$(MUMBLE_ENVIRONMENT_VERSION)'
   MUMBLE_ENVIRONMENT_TOOLCHAIN: '$(MUMBLE_ENVIRONMENT_PATH)/scripts/buildsystems/vcpkg.cmake'
   MUMBLE_SOURCE_COMMIT: '$(Build.SourceVersion)'
@@ -24,8 +24,8 @@ jobs:
     pool:
       vmImage: 'windows-2022'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2024-05-19.5eaf0d45f'
-      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md.2025-02-08.4d858462ac'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
     steps:
     - template: steps_windows.yml
       parameters:
@@ -43,10 +43,10 @@ jobs:
     workspace:
       clean: all
     pool:
-      vmImage: 'macOS-12'
+      vmImage: 'macOS-14'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2024-05-19.5eaf0d45f'
-      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx.2025-02-08.4d858462ac'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx'
     steps:
     - template: steps_macos.yml
       parameters:

diff --git a/.ci/azure-pipelines/main.yml b/.ci/azure-pipelines/main.yml
@@ -1,11 +1,11 @@
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
 variables:
   MUMBLE_ENVIRONMENT_STORE: '$(Agent.ToolsDirectory)/MumbleBuild'
-  MUMBLE_ENVIRONMENT_SOURCE: 'https://github.com/mumble-voip/vcpkg/releases/download/2024-05/'
+  MUMBLE_ENVIRONMENT_SOURCE: 'https://github.com/mumble-voip/vcpkg/releases/download/2025-02/'
   MUMBLE_ENVIRONMENT_PATH: '$(MUMBLE_ENVIRONMENT_STORE)/$(MUMBLE_ENVIRONMENT_VERSION)'
   MUMBLE_ENVIRONMENT_TOOLCHAIN: '$(MUMBLE_ENVIRONMENT_PATH)/scripts/buildsystems/vcpkg.cmake'
   MUMBLE_SOURCE_COMMIT: '$(Build.SourceVersion)'
@@ -22,8 +22,8 @@ jobs:
     pool:
       vmImage: 'windows-2022'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2024-05-19.5eaf0d45f'
-      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md.2025-02-08.4d858462ac'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
     steps:
     - template: steps_windows.yml
       parameters:
@@ -41,10 +41,10 @@ jobs:
     workspace:
       clean: all
     pool:
-      vmImage: 'macOS-12'
+      vmImage: 'macOS-14'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2024-05-19.5eaf0d45f'
-      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx.2025-02-08.4d858462ac'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx'
     steps:
     - template: steps_macos.yml
       parameters:

diff --git a/.ci/azure-pipelines/package_AppImage.bash b/.ci/azure-pipelines/package_AppImage.bash
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 #
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/release_macos.bash b/.ci/azure-pipelines/release_macos.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash -ex
 #
-# Copyright 2021-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/release_windows.bat b/.ci/azure-pipelines/release_windows.bat
@@ -1,4 +1,4 @@
-:: Copyright 2021-2023 The Mumble Developers. All rights reserved.
+:: Copyright The Mumble Developers. All rights reserved.
 :: Use of this source code is governed by a BSD-style license
 :: that can be found in the LICENSE file at the root of the
 :: Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/steps_linux.yml b/.ci/azure-pipelines/steps_linux.yml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/steps_macos.yml b/.ci/azure-pipelines/steps_macos.yml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/steps_windows.yml b/.ci/azure-pipelines/steps_windows.yml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/task-environment-cache.yml b/.ci/azure-pipelines/task-environment-cache.yml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/azure-pipelines/task-publish-artifacts.yml b/.ci/azure-pipelines/task-publish-artifacts.yml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/build_windows.bat b/.ci/build_windows.bat
@@ -1,4 +1,4 @@
-:: Copyright 2021-2023 The Mumble Developers. All rights reserved.
+:: Copyright The Mumble Developers. All rights reserved.
 :: Use of this source code is governed by a BSD-style license
 :: that can be found in the LICENSE file at the root of the
 :: Mumble source tree or at <https://www.mumble.info/LICENSE>.

diff --git a/.ci/install-environment_windows.ps1 b/.ci/install-environment_windows.ps1
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
@@ -141,7 +141,7 @@ pg_ctl start -D "$env:PGDATA"
 
 Write-Output ("CREATE DATABASE mumble_test_db; " +
 	"CREATE USER mumble_test_user ENCRYPTED PASSWORD 'MumbleTestPassword'; " +
-	"GRANT ALL PRIVILEGES ON DATABASE mumble_test_db TO mumble_test_user;") | psql --username "postgres"
+	"ALTER DATABASE mumble_test_db OWNER TO mumble_test_user;") | psql --username "postgres"
 
 
 Write-Host "Configuring MySQL..."
@@ -154,6 +154,9 @@ Start-Process mysqld
 # Give the MySQL daemon some time to start up
 Start-Sleep -Seconds 5
 
+Write-Host ("CREATE DATABASE mumble_test_db; " +
+	"CREATE USER 'mumble_test_user'@'localhost' IDENTIFIED BY 'MumbleTestPassword'; " +
+	"GRANT ALL PRIVILEGES ON mumble_test_db.* TO 'mumble_test_user'@'localhost';")
 Write-Output ("CREATE DATABASE mumble_test_db; " +
 	"CREATE USER 'mumble_test_user'@'localhost' IDENTIFIED BY 'MumbleTestPassword'; " +
 	"GRANT ALL PRIVILEGES ON mumble_test_db.* TO 'mumble_test_user'@'localhost';")  | mysql --user=root
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 The Mumble Developers. All rights reserved.
+# Copyright The Mumble Developers. All rights reserved.
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
@@ -8,7 +8,7 @@ freebsd_instance:
 freebsd_task:
   pkg_script:
   - pkg update && pkg upgrade -y
-  - pkg install -y git ninja pkgconf cmake qt5-buildtools qt5-qmake qt5-linguisttools qt5-concurrent qt5-network qt5-xml qt5-sql qt5-svg qt5-testlib boost-libs libsndfile protobuf ice37 avahi-libdns poco opus
+  - pkg install -y git ninja pkgconf cmake qt6-base qt6-svg qt6-tools boost-libs libsndfile protobuf ice37 avahi-libdns poco opus
   fetch_submodules_script: git submodule --quiet update --init --recursive
   build_script:
   - mkdir build && cd build

diff --git a/.github/actions/install-dependencies/install_ubuntu_shared_64bit.sh b/.github/actions/install-dependencies/install_ubuntu_shared_64bit.sh
@@ -3,17 +3,17 @@
 set -e
 set -x
 
+. /etc/os-release
+
 sudo apt update
 
 sudo apt -y install \
 	build-essential \
 	g++-multilib \
 	ninja-build \
 	pkg-config \
-	qtbase5-dev \
-	qttools5-dev \
-	qttools5-dev-tools \
-	libqt5svg5-dev \
+	qt6-base-dev \
+	qt6-tools-dev \
 	libboost-dev \
 	libssl-dev \
 	libprotobuf-dev \
@@ -35,6 +35,20 @@ sudo apt -y install \
 	libpoco-dev \
 	libsqlite3-dev
 
+# The package was initially called libqt6svg6-dev.
+# Choose correct name based on the Ubuntu version.
+if [[ $VERSION_ID = "22.04" ]]
+then
+	# libgl-dev is required in order for GUI-related components to be found by CMake.
+	# qt6-l10n-tools and qt6-tools-dev-tools are required in order for LinguistTools to be found by CMake.
+	sudo apt -y install libgl-dev \
+						libqt6svg6-dev \
+						qt6-l10n-tools \
+						qt6-tools-dev-tools
+else
+	sudo apt -y install qt6-svg-dev
+fi
+
 # MySQL and PostgreSQL are pre-installed on GitHub-hosted runners. More info about the default setup can be found at
 # - https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-Readme.md#databases
 # - https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md#databases
@@ -59,4 +73,4 @@ sudo systemctl start postgresql.service
 
 echo "CREATE DATABASE mumble_test_db; "\
 	"CREATE USER mumble_test_user ENCRYPTED PASSWORD 'MumbleTestPassword'; "\
-	"GRANT ALL PRIVILEGES ON DATABASE mumble_test_db TO mumble_test_user;" | sudo -u postgres psql
+	"ALTER DATABASE mumble_test_db OWNER TO mumble_test_user;" | sudo -u postgres psql
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -5,9 +5,28 @@ on:
     types: ["labeled", "closed"]
 
 jobs:
+  label_checker:
+    name: Check labels
+    runs-on: ubuntu-latest
+    outputs:
+      state: ${{ steps.check.outputs.label_check }}
+    steps:
+      - id: check
+        uses: agilepathway/[email protected]
+        with:
+          prefix_mode: true
+          any_of: auto-backport-to-
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          allow_failure: true
+      - name: Print status
+        shell: bash
+        run: 'echo "Label detection status: ${{ steps.check.outputs.label_check }}"'
+
+
   backport:
+    needs: [ label_checker ]
     name: Backport PR
-    if: github.event.pull_request.merged == true && !(contains(github.event.pull_request.labels.*.name, 'backport'))
+    if: github.event.pull_request.merged == true && needs.label_checker.outputs.state == 'success'
     runs-on: ubuntu-latest
     steps:
       - name: Backport Action

diff --git a/.github/workflows/release_dispatch.yml b/.github/workflows/release_dispatch.yml
@@ -13,4 +13,5 @@ jobs:
               with:
                   token: ${{ secrets.DOCKER_REPO_ACCCESS_TOKEN }}
                   event-type: new_release
-                  client_payload: '{ "tag": "${{ github.event.release.tag_name }}", "is_latest": "${{ github.event.release.commitish == "master" }}" }'
+                  client_payload: >
+                      { "tag": "${{ github.event.release.tag_name }}", "is_latest": "${{ github.event.release.commitish == 'master' }}" }