picard 2.6 (#5810)

media-sound/picard/patches/picard-2.6.patchset

@@ -1,7 +1,7 @@
-From 772e964be57e7e4f6403a5ed656f8c3e5d7d07c0 Mon Sep 17 00:00:00 2001
+From 731e74fe876b1a0be8ee5926168ff1f08b7eabd5 Mon Sep 17 00:00:00 2001
 From: Philipp Wolfer <ph.wolfer@gmail.com>
 Date: Tue, 29 Jan 2019 11:33:18 +0000
-Subject: [PATCH] Haiku: Avoid using locale.strxfrm
+Subject: [PATCH 3/3] Haiku: Avoid using locale.strxfrm
 
 ---
  picard/ui/options/interface.py | 3 +--
@@ -9,10 +9,10 @@ Subject: [PATCH] Haiku: Avoid using locale.strxfrm
  2 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
-index 602c234c..adb94b0b 100644
+index 81fad103..4fca8cec 100644
 --- a/picard/ui/options/interface.py
 +++ b/picard/ui/options/interface.py
-@@ -29,7 +29,6 @@
+@@ -30,7 +30,6 @@
  
  
  from functools import partial
@@ -20,7 +20,7 @@ index 602c234c..adb94b0b 100644
  import os.path
  
  from PyQt5 import (
-@@ -156,7 +155,7 @@ class InterfaceOptionsPage(OptionsPage):
+@@ -204,7 +203,7 @@ class InterfaceOptionsPage(OptionsPage):
          language_list = [(lang[0], lang[1], _(lang[2])) for lang in UI_LANGUAGES]
  
          def fcmp(x):
@@ -30,7 +30,7 @@ index 602c234c..adb94b0b 100644
              if native and native != translation:
                  name = '%s (%s)' % (translation, native)
 diff --git a/picard/ui/options/releases.py b/picard/ui/options/releases.py
-index 21524096..42ebf942 100644
+index 24f34180..21712fc4 100644
 --- a/picard/ui/options/releases.py
 +++ b/picard/ui/options/releases.py
 @@ -24,8 +24,6 @@
@@ -42,15 +42,15 @@ index 21524096..42ebf942 100644
  from operator import itemgetter
  
  from PyQt5 import (
-@@ -270,7 +268,7 @@ class ReleasesOptionsPage(OptionsPage):
+@@ -275,7 +273,7 @@ class ReleasesOptionsPage(OptionsPage):
              source_list = [(c[0], _(c[1])) for c in source.items()]
  
          def fcmp(x):
 -            return strxfrm(x[1])
 +            return x[1]
          source_list.sort(key=fcmp)
+         config = get_config()
          saved_data = config.setting[setting]
-         move = []
 -- 
-2.26.0
+2.30.2
 

media-sound/picard/picard-2.6.recipe

@@ -12,9 +12,9 @@ HOMEPAGE="https://picard.musicbrainz.org/"
 COPYRIGHT="2004-2021 Robert Kaye, Lukas Lalinsky, Laurent Monin, \
 Sambhav Kothari, Philipp Wolfer and others"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
-CHECKSUM_SHA256="1d56332d9577d79a551e857e246b5c97c2ec4a8abbdeb945c6763e31c3bf9527"
+CHECKSUM_SHA256="0612938a3b4319ba166833149a427ca0ab6e6d29c1d710a87180d0d746a5cd88"
 SOURCE_DIR="picard-release-$portVersion"
 SOURCE_FILENAME="picard"
 PATCHES="picard-$portVersion.patchset"
@@ -36,6 +36,7 @@ REQUIRES="
 	cmd:python3.8
 	dateutil_python38
 	discid_python38
+	fasteners_python38
 	lib:libdiscid$secondaryArchSuffix
 	markdown_python38
 	mutagen_python38