From 4b30ce0f3906da38c1e4bd483f49714ac8c882d5 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 15 Jan 2025 23:51:27 +0100 Subject: [PATCH] Set package requirements to Qt 6.4 --- novelwriter/__init__.py | 8 ++++---- pyproject.toml | 2 +- setup/debian/control | 4 ++-- setup/debian/py3dist-overrides | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index ae1da61d..9590241d 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -202,14 +202,14 @@ def main(sysArgs: list | None = None) -> GuiMain | None: "At least Python 3.10 is required, found %s" % CONFIG.verPyString ) errorCode |= 0x04 - if CONFIG.verQtValue < 0x060000: + if CONFIG.verQtValue < 0x060400: errorData.append( - "At least Qt6 version 6.0 is required, found %s" % CONFIG.verQtString + "At least Qt6 version 6.4 is required, found %s" % CONFIG.verQtString ) errorCode |= 0x08 - if CONFIG.verPyQtValue < 0x060000: + if CONFIG.verPyQtValue < 0x060400: errorData.append( - "At least PyQt6 version 6.0 is required, found %s" % CONFIG.verPyQtString + "At least PyQt6 version 6.4 is required, found %s" % CONFIG.verPyQtString ) errorCode |= 0x10 diff --git a/pyproject.toml b/pyproject.toml index 79ecd45b..e7170be1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] requires-python = ">=3.10" dependencies = [ - "pyqt5>=5.15", + "pyqt6>=6.4", "pyenchant>=3.0.0", ] dynamic = ["version"] diff --git a/setup/debian/control b/setup/debian/control index 9f9e5756..9877bae0 100644 --- a/setup/debian/control +++ b/setup/debian/control @@ -2,14 +2,14 @@ Source: novelwriter Maintainer: Veronica Berglyd Olsen Section: text Priority: optional -Build-Depends: dh-python, python3-setuptools, python3-all, debhelper (>= 9), python3 (>=3.10), python3-pyqt5 (>= 5.15), python3-enchant (>= 2.0) +Build-Depends: dh-python, python3-setuptools, python3-all, debhelper (>= 9), python3 (>=3.10), python3-pyqt6 (>= 6.4), python3-pyqt6.qtsvg (>= 6.4), python3-enchant (>= 2.0) Standards-Version: 4.5.1 Homepage: https://novelwriter.io X-Python3-Version: >= 3.10 Package: novelwriter Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, python3 (>=3.10), python3-pyqt5 (>= 5.15), python3-enchant (>= 2.0) +Depends: ${misc:Depends}, ${python3:Depends}, python3 (>=3.10), python3-pyqt6 (>= 6.4), python3-pyqt6.qtsvg (>= 6.4), python3-enchant (>= 2.0) Description: A markdown-like text editor for planning and writing novels novelWriter is a plain text editor designed for writing novels assembled from many smaller text documents. It uses a minimal formatting syntax inspired by diff --git a/setup/debian/py3dist-overrides b/setup/debian/py3dist-overrides index 2c65b5a4..2544de40 100644 --- a/setup/debian/py3dist-overrides +++ b/setup/debian/py3dist-overrides @@ -1 +1 @@ -pyqt5 python3-pyqt5 +pyqt6 python3-pyqt6