fixed requested changes

This commit is contained in:
defnax 2025-08-09 12:06:14 +02:00
parent 7e8abe1aca
commit 1dc1f4fd56

View file

@ -5,12 +5,16 @@
### Install package dependencies: ### Install package dependencies:
#### Debian/Ubuntu #### Debian/Ubuntu
```bash ```bash
sudo apt-get install g++ cmake qt5-qmake qtmultimedia5-dev \ sudo apt-get install g++ cmake libbz2-dev libjson-c-dev libssl-dev libsqlcipher-dev \
libqt5x11extras5-dev libbz2-dev libjson-c-dev libssl-dev libsqlcipher-dev \
libupnp-dev libxss-dev rapidjson-dev libbotan-2-dev libasio-dev libupnp-dev libxss-dev rapidjson-dev libbotan-2-dev libasio-dev
``` ```
Additional packages to compile with Qt6: To compile with Qt5:
```bash
sudo apt-get install qt5-qmake qtmultimedia5-dev qt6-5compat-dev libqt5x11extras5-dev
```
To compile with Qt6:
```bash ```bash
sudo apt-get install qt6-base-dev qt6-multimedia-dev qt6-5compat-dev sudo apt-get install qt6-base-dev qt6-multimedia-dev qt6-5compat-dev
``` ```
@ -82,6 +86,11 @@ Additional dependencies for plugins:
make make
``` ```
The executable produced will be:
```bash
./retroshare-gui/src/retroshare
```
### Install ### Install
```bash ```bash
sudo make install sudo make install
@ -126,10 +135,9 @@ You need to place sqlcipher so that the hierarchy is:
### Build infos ### Build infos
When you use only Qt6 the packages `qt5-qmake qtmultimedia5-dev libqt5x11extras5-dev` are not needed.
For the `FeedReader` it is required to append the config option `CONFIG+=retroshare_plugins`. For the `FeedReader` it is required to append the config option `CONFIG+=retroshare_plugins`.
Make sure `plugins/plugins.pro` contains `FeedReader` in the list of plugins to compile. Make sure `plugins/plugins.pro` contains `FeedReader` in the list of plugins to compile.
Do not mix plugins compiled with Qt5 with those compiled with Qt6. They work only if they are compiled Do not mix plugins compiled with Qt5 with those compiled with Qt6. They work only if they are compiled
with the same Qt version as RetroShare. with the same Qt version as RetroShare.
@ -145,13 +153,13 @@ For `Autologin` it is required to append the config option `CONFIG+=rs_autologin
* Extra features (optional) * Extra features (optional)
* rs_autologin: enable autologin * rs_autologin: enable autologin
* retroshare_plugins: build plugins * retroshare_plugins: build plugins
* rs_webui: enable remoting features * rs_webui: enable Web interface
* rs_jsonapi: enable json api interface * rs_jsonapi: enable json api interface, required by rs_webui
* gxsthewire enable Wire service * gxsthewire: enable Wire service (experimental)
* wikipoos enable Wiki service * wikipoos: enable Wiki service (experimental)
* rs_use_native_dialogs enable native dialogs * rs_use_native_dialogs: enable native dialogs (may cause crashes with some versions of Gtk)
* rs_deep_channels_index build with deep channel indexing support * rs_deep_channels_index: build with deep channel indexing support
* rs_deep_files_index build with deep file indexing support * rs_deep_files_index: build with deep file indexing support
* "CONFIG+=..." enable other extra compile time features, you can find the almost complete list in file *<sourcefolder>\retroshare.pri* * "CONFIG+=..." enable other extra compile time features, you can find the almost complete list in file *<sourcefolder>\retroshare.pri*
Example: Example:
@ -160,6 +168,4 @@ Example:
qmake CONFIG-=debug CONFIG+=release CONFIG+=rs_use_native_dialog CONFIG+=rs_gui_cmark qmake CONFIG-=debug CONFIG+=release CONFIG+=rs_use_native_dialog CONFIG+=rs_gui_cmark
qmake CONFIG+=rs_jsonapi CONFIG+=rs_webui CONFIG+=rs_autologin qmake CONFIG+=rs_jsonapi CONFIG+=rs_webui CONFIG+=rs_autologin
qmake CONFIG+=rs_deep_channels_index CONFIG += gxsthewire CONFIG += wikipoos qmake CONFIG+=rs_deep_channels_index CONFIG += gxsthewire CONFIG += wikipoos
``` ```