From eec779a08dd7ab553cd72cf04672ab75cb1dd704 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 24 May 2024 17:50:47 +0100 Subject: [PATCH 1/4] Update Fedora for next Release --- Dockerfile.fedora | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index f33b1f3..25b74f2 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -1,4 +1,4 @@ -FROM fedora:39 +FROM fedora:40 RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm @@ -7,5 +7,5 @@ RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python python3-platformdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \ python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 python3-flask \ python3-flask-cors python3-distro mediainfo patch xorg-x11-server-Xvfb ghostscript python3-pip \ - python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu -RUN pip install pytest-qt + python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu Qt6 +RUN pip install pytest-qt PySide6 From 2c934d38368b3a1e2a2bc9c483da09dcaebd4333 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 24 May 2024 17:54:47 +0100 Subject: [PATCH 2/4] Fix silly --- Dockerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 25b74f2..387f725 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -7,5 +7,5 @@ RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python python3-platformdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \ python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 python3-flask \ python3-flask-cors python3-distro mediainfo patch xorg-x11-server-Xvfb ghostscript python3-pip \ - python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu Qt6 + python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu qt6 RUN pip install pytest-qt PySide6 From 9d7dd53c2382fd46012035d5bee93007319dbea1 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 24 May 2024 20:43:13 +0100 Subject: [PATCH 3/4] Fix again --- Dockerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 387f725..3e07aec 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -7,5 +7,5 @@ RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python python3-platformdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \ python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 python3-flask \ python3-flask-cors python3-distro mediainfo patch xorg-x11-server-Xvfb ghostscript python3-pip \ - python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu qt6 + python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu qt6-qtcore RUN pip install pytest-qt PySide6 From 1d9b8dfe03287cf1d28a8e4d92f2b300cd1d0bd8 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 24 May 2024 20:46:38 +0100 Subject: [PATCH 4/4] Fix again --- Dockerfile.fedora | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 3e07aec..f8cc088 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -7,5 +7,6 @@ RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python python3-platformdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \ python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 python3-flask \ python3-flask-cors python3-distro mediainfo patch xorg-x11-server-Xvfb ghostscript python3-pip \ - python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu qt6-qtcore + python-PyMuPDF python3-qrcode python3-pillow-qt python3-pyicu qt6-qtbase qt6-qtmultimedia \ + qt6-qtwebengine RUN pip install pytest-qt PySide6