Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2c5c95d7b | ||
|
|
3549c23019 | ||
|
|
ae64704bb5 | ||
|
|
3352db85b5 |
||
|
|
bdb663bcb2 | ||
|
|
9b93cdc000 |
||
|
|
816c6854c5 | ||
|
|
1c002c8b55 | ||
|
|
7ddeb8c683 | ||
|
|
e1c61b4dc9 | ||
|
|
6b2f3fc996 |
2 changed files with 27 additions and 8 deletions
12
0001-fix-check-version.patch
Normal file
12
0001-fix-check-version.patch
Normal file
|
|
@ -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
|
||||
|
|
@ -28,11 +28,13 @@ 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
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-qt5-devel
|
||||
BuildRequires: python3-pyqt6-devel
|
||||
BuildRequires: /usr/bin/appstream-util
|
||||
BuildRequires: /usr/bin/desktop-file-validate
|
||||
|
||||
|
|
@ -42,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
|
||||
|
||||
|
|
@ -59,15 +60,21 @@ 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
|
||||
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue