From 2a38114480e3f77e79a01afb296f0048ac8b2d9a Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Mon, 2 Dec 2024 14:40:31 +0100
Subject: [PATCH 1/3] DOCS(build_linux): Sort Debian Build Dependencies

This makes it (much) easier to check whether one has all the Build
Dependencies installed or not.
---
 docs/dev/build-instructions/build_linux.md | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/dev/build-instructions/build_linux.md b/docs/dev/build-instructions/build_linux.md
index 8da55002e9e..1a971a0dd66 100644
--- a/docs/dev/build-instructions/build_linux.md
+++ b/docs/dev/build-instructions/build_linux.md
@@ -55,31 +55,31 @@ run the following command.
 sudo apt install \
   build-essential \
   cmake \
-  pkg-config \
-  qt6-base-dev \
-  qtchooser \
-  qt6-base-dev-tools \
-  qt6-tools-dev \
-  qt6-tools-dev-tools \
-  libqt6svg6-dev \
-  qt6-l10n-tools \
-  libgl-dev \
+  g++-multilib \
+  libasound2-dev \
+  libavahi-compat-libdnssd-dev \
   libboost-dev \
-  libssl-dev \
-  libprotobuf-dev \
-  protobuf-compiler \
-  libprotoc-dev \
   libcap-dev \
-  libxi-dev \
-  libasound2-dev \
+  libgl-dev \
   libogg-dev \
+  libpoco-dev \
+  libprotobuf-dev \
+  libprotoc-dev \
+  libqt6svg6-dev \
   libsndfile1-dev \
   libspeechd-dev \
-  libavahi-compat-libdnssd-dev \
+  libssl-dev \
   libxcb-xinerama0 \
+  libxi-dev \
   libzeroc-ice-dev \
-  libpoco-dev \
-  g++-multilib
+  pkg-config \
+  protobuf-compiler \
+  qt6-base-dev \
+  qt6-base-dev-tools \
+  qt6-l10n-tools \
+  qt6-tools-dev \
+  qt6-tools-dev-tools \
+  qtchooser
 ```
 
 1. There is a problem with Opus, causing crashes on some systems. Disabling the bundled opus version when running cmake might be necessary for now:

From 55d5be2ea85b11635c8996a30cbb1fc7945f5f3b Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Mon, 2 Dec 2024 14:49:45 +0100
Subject: [PATCH 2/3] DOCS(build_linux): Actually update Debian B-D: pkg-config
 -> pkgconf

Since Debian Bookworm the pkg-config package is a transitional package
to pkgconf, so update the build dependency install instructions to point
to its target.

In PR 6643 I accidentally updated the instructions for Ubuntu instead of
for Debian, so now actually update the instructions for Debian as well.
FTR: In Ubuntu Noble (2024.04) it's also a transitional package.

Link: https://github.com/mumble-voip/mumble/pull/6643
---
 docs/dev/build-instructions/build_linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dev/build-instructions/build_linux.md b/docs/dev/build-instructions/build_linux.md
index 1a971a0dd66..1e89e932f29 100644
--- a/docs/dev/build-instructions/build_linux.md
+++ b/docs/dev/build-instructions/build_linux.md
@@ -72,7 +72,7 @@ sudo apt install \
   libxcb-xinerama0 \
   libxi-dev \
   libzeroc-ice-dev \
-  pkg-config \
+  pkgconf \
   protobuf-compiler \
   qt6-base-dev \
   qt6-base-dev-tools \

From 9c7877f1ef322a014f7a4d25862bd6eb2f27f3d3 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Mon, 2 Dec 2024 14:54:30 +0100
Subject: [PATCH 3/3] DOCS(build_linux): Add missing B-Ds to Debian
 instructions

Mumble can be compiled with several system libraries, so add their
development library to the list of Build-Depends.
In order to actually compile with them, you need to specify the
configuration options as described in cmake_options.md.

Those are for the newly added B-Ds:
1) -Dbundled-gsl=OFF
2) -Dbundled-speex=OFF
3) -Dbundled-json=OFF

Closes: #6644
---
 docs/dev/build-instructions/build_linux.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/dev/build-instructions/build_linux.md b/docs/dev/build-instructions/build_linux.md
index 1e89e932f29..4955685bcbb 100644
--- a/docs/dev/build-instructions/build_linux.md
+++ b/docs/dev/build-instructions/build_linux.md
@@ -61,6 +61,7 @@ sudo apt install \
   libboost-dev \
   libcap-dev \
   libgl-dev \
+  libmsgsl-dev \
   libogg-dev \
   libpoco-dev \
   libprotobuf-dev \
@@ -68,10 +69,12 @@ sudo apt install \
   libqt6svg6-dev \
   libsndfile1-dev \
   libspeechd-dev \
+  libspeexdsp-dev \
   libssl-dev \
   libxcb-xinerama0 \
   libxi-dev \
   libzeroc-ice-dev \
+  nlohmann-json3-dev \
   pkgconf \
   protobuf-compiler \
   qt6-base-dev \