From 8c59589be1a46ec8046b5b8d53c28d8efb91b13e Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Mon, 22 Apr 2024 22:49:53 +0300 Subject: [PATCH] Inform users about Pyside6 and conmon packages Inform users that for specific distros and versions, we install some extra packages (PySide6, conmon), in order to fix some incompatibilities between Dangerzone and the base system. Provide also a link to the source / build instructions for the package, as well as any relevant issues. Fixes #767 --- BUILD.md | 8 ++++++++ INSTALL.md | 37 +++++++++++++++++++++++++++++++++++++ dev_scripts/qa.py | 8 ++++++++ 3 files changed, 53 insertions(+) diff --git a/BUILD.md b/BUILD.md index 84ec47e..e1ae680 100644 --- a/BUILD.md +++ b/BUILD.md @@ -4,6 +4,9 @@ Install dependencies: + + + + +
:memo: Expand this section if you are on Ubuntu 22.04 (Jammy).
@@ -20,10 +23,15 @@ Install dependencies: sudo cp ./dev_scripts/apt-tools-prod.pref /etc/apt/preferences.d/ ``` + The `conmon` package provided in the above repo was built with the + following [instructions](https://github.com/freedomofpress/maint-dangerzone-conmon/tree/ubuntu/jammy/fpf). Alternatively, you can install a `conmon` version higher than `v2.0.25` from any repo you prefer.
+
```sh sudo apt install -y podman dh-python build-essential fakeroot make libqt6gui6 \ diff --git a/INSTALL.md b/INSTALL.md index c86748f..e90bbf7 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -57,6 +57,26 @@ Dangerzone is available for: + + + + +
+
+ :information_source: Backport notice for Ubuntu 24.04 (Noble) users regarding the conmon package +
+ + The `conmon` version that Podman uses and Ubuntu Jammy ships, has a bug + that gets triggered by Dangerzone + (more details in https://github.com/freedomofpress/dangerzone/issues/685). + To fix this, we provide our own `conmon` package through our APT repo, which + was built with the following [instructions](https://github.com/freedomofpress/maint-dangerzone-conmon/tree/ubuntu/jammy/fpf). + This package is essentially a backport of the `conmon` package + [provided](https://packages.debian.org/source/oldstable/conmon) by Debian + Bullseye. +
+
+ Add our repository following these instructions: Download the GPG key for the repo: @@ -110,6 +130,23 @@ sudo apt install -y dangerzone ### Fedora + + + + +
+
+ :information_source: Backport notice for Fedora users regarding the python3-pyside6 package +
+ + Fedora 39+ onwards does not provide official Python bindings for Qt. For + this reason, we provide our own `python3-pyside6` package (see + [build instructions](https://github.com/freedomofpress/maint-dangerzone-pyside6)) + from our YUM repo. For a deeper dive on this subject, you may read + [this issue](https://github.com/freedomofpress/dangerzone/issues/211#issuecomment-1827777122). +
+
+ Type the following commands in a terminal: ``` diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index 49919d9..80d2a4f 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -187,6 +187,9 @@ CONTENT_BUILD_DEBIAN_UBUNTU = r"""## Debian/Ubuntu Install dependencies: + + + + +
:memo: Expand this section if you are on Ubuntu 22.04 (Jammy).
@@ -203,10 +206,15 @@ Install dependencies: sudo cp ./dev_scripts/apt-tools-prod.pref /etc/apt/preferences.d/ ``` + The `conmon` package provided in the above repo was built with the + following [instructions](https://github.com/freedomofpress/maint-dangerzone-conmon/tree/ubuntu/jammy/fpf). Alternatively, you can install a `conmon` version higher than `v2.0.25` from any repo you prefer.
+
```sh sudo apt install -y podman dh-python build-essential fakeroot make libqt6gui6 \