[PR PATCH] picard: update to 2.6.4.

[PR PATCH] picard: update to 2.6.4.

[kartikynwa]

[-- Attachment #1: Type: text/plain, Size: 1168 bytes --]

There is a new pull request by kartikynwa against master on the void-packages repository

https://github.com/kartikynwa/void-packages picard-update
https://github.com/void-linux/void-packages/pull/33912

picard: update to 2.6.4.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-picard-update-33912.patch --]
[-- Type: text/x-diff, Size: 4853 bytes --]

From dd00d46c3657a6c160a06c4377976484a772d458 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Fri, 5 Nov 2021 19:06:53 +0530
Subject: [PATCH] picard: update to 2.6.4.

---
 ...0001-Fix-TypeErrors-with-Python-3.10.patch | 64 -------------------
 srcpkgs/picard/template                       | 10 +--
 2 files changed, 5 insertions(+), 69 deletions(-)
 delete mode 100644 srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch

diff --git a/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch b/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch
deleted file mode 100644
index 29afe48c07fd..000000000000
--- a/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch
+++ /dev/null
@@ -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
-
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 4e5a14dcf26c..b5ea59ed5e07 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,14 +1,14 @@
 # Template file for 'picard'
 pkgname=picard
-version=2.5
-revision=4
+version=2.6.4
+revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 make_install_args="--disable-autoupdate"
 hostmakedepends="gettext python3-setuptools"
 makedepends="python3-devel"
 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"
 checkdepends="python3-pytest $depends"
 short_desc="MusicBrainz's audio tagger"
@@ -16,5 +16,5 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://picard.musicbrainz.org/"
 changelog="https://picard.musicbrainz.org/changelog/"
-distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
-checksum=f9df2882c1fcb46d69c89c87485c77bcff7d9c738b004694fa0fb31280677963
+distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=c71ec4605842e24bbe6d92639e1cafac943548afed3a05193488d4bcc3d95370

Re: [PR PATCH] [Merged]: picard: update to 2.6.4.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]

There's a merged pull request on the void-packages repository

picard: update to 2.6.4.
https://github.com/void-linux/void-packages/pull/33912

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl