picard: update to 2.6.4.
This commit is contained in:
parent
f8290809ee
commit
4c8eef4f41
|
@ -1,64 +0,0 @@
|
||||||
From 1a462bf718f9fc4b24a0c8daefe5c7d547712ae9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Louis Sautier <sautier.louis@gmail.com>
|
|
||||||
Date: Fri, 27 Aug 2021 00:43:48 +0200
|
|
||||||
Subject: [PATCH] Fix TypeErrors with Python 3.10
|
|
||||||
|
|
||||||
Without these changes, running Picard with Python 3.10 results in errors
|
|
||||||
such as:
|
|
||||||
File "./picard/ui/coverartbox.py", line 74, in __init__
|
|
||||||
self.shadow = self.shadow.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
|
|
||||||
TypeError: arguments did not match any overloaded call:
|
|
||||||
scaled(self, int, int, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
|
|
||||||
scaled(self, QSize, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
|
|
||||||
---
|
|
||||||
picard/ui/coverartbox.py | 2 +-
|
|
||||||
picard/ui/itemviews.py | 6 +++---
|
|
||||||
picard/util/__init__.py | 2 +-
|
|
||||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
|
|
||||||
index 2457de5f..cd0cce2a 100644
|
|
||||||
--- a/picard/ui/coverartbox.py
|
|
||||||
+++ b/picard/ui/coverartbox.py
|
|
||||||
@@ -136,7 +136,7 @@ class CoverArtThumbnail(ActiveLabel):
|
|
||||||
event.acceptProposedAction()
|
|
||||||
|
|
||||||
def scaled(self, *dimensions):
|
|
||||||
- return (self.pixel_ratio * dimension for dimension in dimensions)
|
|
||||||
+ return (round(self.pixel_ratio * dimension) for dimension in dimensions)
|
|
||||||
|
|
||||||
def show(self):
|
|
||||||
self.set_data(self.data, True)
|
|
||||||
diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
|
|
||||||
index cddbf50a..bb88e984 100644
|
|
||||||
--- a/picard/ui/itemviews.py
|
|
||||||
+++ b/picard/ui/itemviews.py
|
|
||||||
@@ -137,9 +137,9 @@ def get_match_color(similarity, basecolor):
|
|
||||||
c1 = (basecolor.red(), basecolor.green(), basecolor.blue())
|
|
||||||
c2 = (223, 125, 125)
|
|
||||||
return QtGui.QColor(
|
|
||||||
- c2[0] + (c1[0] - c2[0]) * similarity,
|
|
||||||
- c2[1] + (c1[1] - c2[1]) * similarity,
|
|
||||||
- c2[2] + (c1[2] - c2[2]) * similarity)
|
|
||||||
+ int(c2[0] + (c1[0] - c2[0]) * similarity),
|
|
||||||
+ int(c2[1] + (c1[1] - c2[1]) * similarity),
|
|
||||||
+ int(c2[2] + (c1[2] - c2[2]) * similarity))
|
|
||||||
|
|
||||||
|
|
||||||
class MainPanel(QtWidgets.QSplitter):
|
|
||||||
diff --git a/picard/util/__init__.py b/picard/util/__init__.py
|
|
||||||
index e47af34c..d12ef890 100644
|
|
||||||
--- a/picard/util/__init__.py
|
|
||||||
+++ b/picard/util/__init__.py
|
|
||||||
@@ -333,7 +333,7 @@ def throttle(interval):
|
|
||||||
else:
|
|
||||||
decorator.args = args
|
|
||||||
decorator.kwargs = kwargs
|
|
||||||
- QtCore.QTimer.singleShot(r, later)
|
|
||||||
+ QtCore.QTimer.singleShot(int(r), later)
|
|
||||||
decorator.is_ticking = True
|
|
||||||
mutex.unlock()
|
|
||||||
|
|
||||||
--
|
|
||||||
2.32.0
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
# Template file for 'picard'
|
# Template file for 'picard'
|
||||||
pkgname=picard
|
pkgname=picard
|
||||||
version=2.5
|
version=2.6.4
|
||||||
revision=4
|
revision=1
|
||||||
wrksrc="${pkgname}-release-${version}"
|
wrksrc="${pkgname}-release-${version}"
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
make_install_args="--disable-autoupdate"
|
make_install_args="--disable-autoupdate"
|
||||||
hostmakedepends="gettext python3-setuptools"
|
hostmakedepends="gettext python3-setuptools"
|
||||||
makedepends="python3-devel"
|
makedepends="python3-devel"
|
||||||
depends="python3-PyQt5-multimedia chromaprint python3-mutagen
|
depends="python3-PyQt5-multimedia chromaprint python3-mutagen
|
||||||
python3-dateutil python3-discid desktop-file-utils
|
python3-dateutil python3-discid python3-fasteners desktop-file-utils
|
||||||
hicolor-icon-theme"
|
hicolor-icon-theme"
|
||||||
checkdepends="python3-pytest $depends"
|
checkdepends="python3-pytest $depends"
|
||||||
short_desc="MusicBrainz's audio tagger"
|
short_desc="MusicBrainz's audio tagger"
|
||||||
|
@ -16,5 +16,5 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://picard.musicbrainz.org/"
|
homepage="https://picard.musicbrainz.org/"
|
||||||
changelog="https://picard.musicbrainz.org/changelog/"
|
changelog="https://picard.musicbrainz.org/changelog/"
|
||||||
distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
|
distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=f9df2882c1fcb46d69c89c87485c77bcff7d9c738b004694fa0fb31280677963
|
checksum=c71ec4605842e24bbe6d92639e1cafac943548afed3a05193488d4bcc3d95370
|
||||||
|
|
Loading…
Reference in New Issue