Merge remote-tracking branch 'upstream/main'

This fork has been unmaintained for years. Rebasing all of upstream's
changes would be lot of effort with no obvious benefit. Thus I decided to simply
merge upstream/main while temporarily ignoring all conflicts:
git merge -X theirs upstream/main

As a consequence, this branch will be broken in all commits between
2022-05-24 and 2025-01-19.

Basic functionality will be restored in the following commits.

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/fmtlib/fmt.git
 [submodule "src/extern/tor"]
 	path = src/extern/tor
-	url = https://git.torproject.org/tor.git
+	url = https://gitlab.torproject.org/tpo/core/tor.git

BUILDING.md

@@ -1,25 +1,7 @@
 # Building Ricochet Refresh
 
-These instructions are intended for people who wish to build or modify Ricochet
-Refresh from source.
-
-## Getting the source code
-
-Clone the Ricochet Refresh git repository with `--recurse-submodules`:
-```sh
-git clone --recurse-submodules https://github.com/blueprint-freespeech/ricochet-refresh.git
-```
-
-In the event that you cloned the repo without fetching the submodules, you can
-still get them with:
-```sh
-git submodule --init --update
-```
-
-Later, you should update your local repository with:
-```sh
-git pull --recurse-submodules
-```
+These instructions are intended for people who wish to build Ricochet Refresh
+from source.
 
 ## GNU/Linux
 
@@ -35,7 +17,7 @@ You will need:
 
 You may opt between installing {fmt} from your distro packages, as instructed
 bellow, or use the {fmt} version included as a submodule (configure time flag
-`-DUSE_SUBMODULE_FMT`).
+`-DUSE_SUBMODULE_FMT=ON`).
 
 #### Fedora
 ```sh
@@ -47,7 +29,8 @@ yum install cmake tor gcc-c++ protobuf-devel protobuf-compiler openssl-devel fmt
 ```sh
 apt install cmake tor build-essential libprotobuf-dev protobuf-compiler libssl-dev \
             libfmt-dev qtbase5-dev qtdeclarative5-dev qml-module-qtquick-layouts \
-            qml-module-qtquick-controls qml-module-qtquick-dialogs
+            qml-module-qtquick-controls qml-module-qtquick-dialogs qttools5-dev \
+            qtmultimedia5-dev qtquickcontrols2-5-dev
 ```
 
 If the `qml-module-qtquick` packages aren't available, try `qtdeclarative5-controls-plugin` instead.
@@ -58,10 +41,31 @@ pacman -S cmake tor qt5-base qt5-declarative qt5-quickcontrols openssl fmt \
           protobuf
 ```
 
+### Getting the source code
+
+When using {fmt} from distro packages, clone the Ricochet Refresh git repository
+without submodules and just get the Tor submodule.
+```sh
+git clone https://github.com/blueprint-freespeech/ricochet-refresh.git
+cd ricochet-refresh
+git submodule update --init src/extern/tor
+```
+
+If you wish to use the {fmt} version included as submodule do:
+```sh
+git submodule update --init src/extern/fmt
+```
+
+Later, you may update your local repository with:
+```sh
+git pull --recurse-submodules
+```
+
 ### Building
 ```sh
 mkdir build
-cmake -S ./src -B ./build -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=MinSizeRel -DRICOCHET_REFRESH_INSTALL_DESKTOP=ON
+cmake -S ./src -B ./build -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=MinSizeRel \
+  -DRICOCHET_REFRESH_INSTALL_DESKTOP=ON -DUSE_SUBMODULE_FMT=OFF
 cmake --build ./build -j$(nproc)
 ```
 

README.md

@@ -4,8 +4,8 @@
 [R2: Ricochet-Refresh](https://github.com/blueprint-freespeech/ricochet-refresh/)
 P2P chat network.
 
-With this, you can use your favorite IRC client as a UI for Ricochet, for
-example [WeeChat](https://weechat.org/):
+## R<sup>2</sup>: Ricochet Refresh
+Ricochet Refresh is the new updated version of Ricochet, supported by Blueprint for Free Speech. We are a non-government, not-for-profit organisation working to safeguard the freedom of expression for whistleblowers, activists, and everybody else, worldwide. To find out more, check out our profile, or head to [blueprintforfreespeech.net](https://blueprintforfreespeech.net). Blueprint was the original sponsor of Ricochet, written by developer J. Brooks.
 
 ![ricochet-irc screenshot](doc/irc/ricochet-irc.png)
 

design/README.md

@@ -0,0 +1,9 @@
+# Designs
+
+This directory contains work-in-progress UX designs. Json files are viewable and editable using [mydraft.cc](https://mydraft.cc).
+
+Sources:
+- [alpha-designs.json](alpha-designs.json)
+
+PDF exports:
+- [alpha-designs.pdf](alpha-designs.pdf)