From c13e594ff363aec6683b65f866884802ac493b96 Mon Sep 17 00:00:00 2001
From: Alex Pyrgiotis <alex.p@freedom.press>
Date: Mon, 14 Oct 2024 22:38:59 +0300
Subject: [PATCH] FIXUP: Install Python 3.12

---
 .github/workflows/ci.yml      | 2 ++
 dev_scripts/env.py            | 9 +++++++++
 dev_scripts/qa.py             | 2 +-
 install/linux/dangerzone.spec | 2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d1123a..450ef6e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -319,6 +319,8 @@ jobs:
             version: "39"
           - distro: fedora
             version: "40"
+          - distro: fedora
+            version: "41"
 
     steps:
       - name: Checkout
diff --git a/dev_scripts/env.py b/dev_scripts/env.py
index 8f21dda..90653eb 100755
--- a/dev_scripts/env.py
+++ b/dev_scripts/env.py
@@ -163,6 +163,13 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 """
 
+# NOTE: For Fedora 41 specifically, we need to install Python 3.12, else PySide6 from
+# PyPI won't work.
+DOCKERFILE_BUILD_DEV_FEDORA_41_DEPS = r"""
+# Install Python 3.12 since our project is not compatible yet with Python 3.13.
+RUN dnf install -y python3.12
+"""
+
 # FIXME: Install Poetry on Fedora via package manager.
 DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
 RUN dnf install -y git rpm-build podman python3 python3-devel python3-poetry-core \
@@ -661,6 +668,8 @@ class Env:
 
         if self.distro == "fedora":
             install_deps = DOCKERFILE_BUILD_DEV_FEDORA_DEPS
+            if self.version == "41":
+                install_deps += DOCKERFILE_BUILD_DEV_FEDORA_41_DEPS
         else:
             # Use Qt6 in all of our Linux dev environments, and add a missing
             # libxcb-cursor0 dependency
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index f8f943e..b56386d 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -60,7 +60,7 @@ and newer platforms, we have to do the following:
   - [ ] Run the Dangerzone tests.
   - [ ] Create an .rpm package and install it system-wide.
   - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
-- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 39 as
+- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 40 as
   of writing this) and make sure it works:
   - [ ] Create a new development environment with Poetry.
   - [ ] Run the Dangerzone tests.
diff --git a/install/linux/dangerzone.spec b/install/linux/dangerzone.spec
index 6a47843..fbdeebd 100644
--- a/install/linux/dangerzone.spec
+++ b/install/linux/dangerzone.spec
@@ -221,6 +221,8 @@ convert the documents within a secure sandbox.
 %prep
 %autosetup -p1 -n dangerzone-%{version}
 
+sed -i 's/3.13/3.14/' pyproject.toml
+
 %generate_buildrequires
 %pyproject_buildrequires -R