From a98962ca2511569df90bfcbb78d647c3e270a099 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:54:47 +0000 Subject: [PATCH 01/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 98ba6fd678f759cbf0314f3989af829f85b76c24 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 21:04:46 +0200 Subject: [PATCH 02/15] Rebuilt for Python 3.13 From e3fa878a82bc432bd2ea3758f83ec73b443f4240 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 23:21:35 +0200 Subject: [PATCH 03/15] Rebuilt for Python 3.13 From 140ab7fa9baf2fb232cad8f65fa4abefb7040615 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:51:08 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6b2f3fc996fdf6690be27cc03f1ecb203c0f25c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:26:02 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e1c61b4dc94a8d119f4a07929e2930387f4416fd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:53:10 +0200 Subject: [PATCH 06/15] Rebuilt for Python 3.14 From 7ddeb8c6834deb064bce18cad94676aaf05066aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:07:55 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1c002c8b5504cf583179034eb9fec8c968df4956 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:03 +0200 Subject: [PATCH 08/15] Rebuilt for Python 3.14.0rc2 bytecode From 816c6854c5d3acb0d0d3c9596560aa57c6c8400c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:15 +0200 Subject: [PATCH 09/15] Rebuilt for Python 3.14.0rc3 bytecode From 9b93cdc000dcdd5f9ba09d2f76244d422273cdf6 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Mon, 10 Nov 2025 15:46:12 +0000 Subject: [PATCH 10/15] fix: backport patch for handling pyqt version strings with `dev` prefix Referece: https://github.com/karlch/vimiv-qt/commit/0902c81a4cefc516cfdac3627a23bcd133291580 --- 0001-fix-check-version.patch | 12 ++++++++++++ vimiv-qt.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 0001-fix-check-version.patch diff --git a/0001-fix-check-version.patch b/0001-fix-check-version.patch new file mode 100644 index 0000000..63d8dfe --- /dev/null +++ b/0001-fix-check-version.patch @@ -0,0 +1,12 @@ +diff -ur vimiv-qt-0.9.0.orig/vimiv/checkversion.py vimiv-qt-0.9.0/vimiv/checkversion.py +--- vimiv-qt-0.9.0.orig/vimiv/checkversion.py 2025-11-10 15:42:55.589597665 +0000 ++++ vimiv-qt-0.9.0/vimiv/checkversion.py 2025-11-10 15:43:08.323760397 +0000 +@@ -22,7 +22,7 @@ + try: + from PyQt5.QtCore import PYQT_VERSION_STR + +- PYQT_VERSION = tuple(map(int, PYQT_VERSION_STR.split("."))) ++ PYQT_VERSION = tuple(map(int, PYQT_VERSION_STR.split(".")[:3])) + except ImportError: # pragma: no cover # PyQt is there in tests, using None is tested + # We check explicitly for None before using the tuple version + PYQT_VERSION = None # type: ignore diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 5534673..baf5841 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -28,6 +28,8 @@ Summary: An image viewer with vim-like keybindings License: GPL-3.0-or-later URL: https://karlch.github.io/vimiv-qt/ Source0: https://github.com/karlch/vimiv-qt/archive/v%{version}/%{name}-%{version}.tar.gz +# Backport: https://github.com/karlch/vimiv-qt/commit/0902c81a4cefc516cfdac3627a23bcd133291580 +Patch: 0001-fix-check-version.patch BuildRequires: make BuildRequires: gcc BuildRequires: python3-devel @@ -59,7 +61,7 @@ Obsoletes: vimiv < 0.9.1-14 %description %_description %prep -%autosetup -n vimiv-qt-%{version} +%autosetup -n vimiv-qt-%{version} -p1 rm -rf vimiv-qt.egg-info # Don't do the python bit there mv -v misc/Makefile . From bdb663bcb24c85d469a4f1b7a504f0805a58b559 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:57:12 +0000 Subject: [PATCH 11/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3352db85b52723bdcd3749378769c55775efaae5 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 6 Feb 2026 12:17:49 +0000 Subject: [PATCH 12/15] feat: update to use pyqt6 and other tweaks --- vimiv-qt.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index baf5841..e7584f3 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -34,7 +34,7 @@ BuildRequires: make BuildRequires: gcc BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-qt5-devel +BuildRequires: python3-pyqt6-devel BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/desktop-file-validate @@ -44,9 +44,8 @@ BuildRequires: %{py3_dist pytest-bdd} BuildRequires: %{py3_dist flaky} %endif # Not listed in setup.py -Requires: python3-piexif -# python3-qt5-base is pulled in but SVG requires python3-qt5 -Requires: python3-qt5 +Recommends: %{py3_dist piexif} + # For icons Requires: hicolor-icon-theme @@ -63,13 +62,19 @@ Obsoletes: vimiv < 0.9.1-14 %prep %autosetup -n vimiv-qt-%{version} -p1 rm -rf vimiv-qt.egg-info + +# Comment out to remove /usr/bin/env shebangs +# Can use something similar to correct/remove /usr/bin/python shebangs also +# find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/env.*$/ d' {} 2>/dev/null ';' + +# update req +sed -i 's/"PyQt5>=.*"/"PyQt6"/' setup.py +cat setup.py + # Don't do the python bit there mv -v misc/Makefile . sed -i '/python3 setup.py install/ d' Makefile sed -i '/LICENSE/ d' Makefile -# Comment out to remove /usr/bin/env shebangs -# Can use something similar to correct/remove /usr/bin/python shebangs also -# find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/env.*$/ d' {} 2>/dev/null ';' %generate_buildrequires %pyproject_buildrequires From ae64704bb59a94e0376bd84c194fb10588022e03 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:19 +0200 Subject: [PATCH 13/15] Rebuilt for Python 3.15 From 3549c2301990535e59f7154bead2bc72aceceb1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:31:17 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From e2c5c95d7b45d6e08bbdd22f69e839d0844c25c1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:16:22 +0200 Subject: [PATCH 15/15] Rebuilt for Python 3.15.0b4 ABI change