From 35d489d476efc7b4b1e0cbb43174c3bf5a132862 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 13 Feb 2023 09:38:18 +0100
Subject: [PATCH] picard: remove patches (#7854)

No longer needed since recent fixes to Haiku's wcsxfrm implementation
---
 .../picard/patches/picard-2.8.5.patchset      | 78 -------------------
 media-sound/picard/picard-2.8.5.recipe        |  3 +-
 2 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 media-sound/picard/patches/picard-2.8.5.patchset

diff --git a/media-sound/picard/patches/picard-2.8.5.patchset b/media-sound/picard/patches/picard-2.8.5.patchset
deleted file mode 100644
index b9406fa3c..000000000
--- a/media-sound/picard/patches/picard-2.8.5.patchset
+++ /dev/null
@@ -1,78 +0,0 @@
-From d3f8d525caade89de8505c0cfe66992afc16b921 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 3/3] Haiku: Avoid using locale.strxfrm
-
-On Haiku this causes frequent core dumps
----
- picard/ui/itemviews.py         | 3 +--
- picard/ui/options/interface.py | 3 +--
- picard/ui/options/releases.py  | 3 +--
- 3 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
-index ed4d6f56..4ead4146 100644
---- a/picard/ui/itemviews.py
-+++ b/picard/ui/itemviews.py
-@@ -84,7 +84,6 @@ from picard.util import (
-     natsort,
-     normpath,
-     restore_method,
--    strxfrm,
- )
- 
- from picard.ui.collectionmenu import CollectionMenu
-@@ -924,7 +923,7 @@ class TreeItem(QtWidgets.QTreeWidgetItem):
-         elif column in MainPanel.NAT_SORT_COLUMNS:
-             sortkey = natsort.natkey(self.text(column))
-         else:
--            sortkey = strxfrm(self.text(column))
-+            sortkey = self.text(column).lower()
-         self._sortkeys[column] = sortkey
-         return sortkey
- 
-diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
-index 38616a98..d72b1a8a 100644
---- a/picard/ui/options/interface.py
-+++ b/picard/ui/options/interface.py
-@@ -47,7 +47,6 @@ from picard.const import UI_LANGUAGES
- from picard.const.sys import IS_MACOS
- from picard.util import (
-     icontheme,
--    strxfrm,
- )
- 
- from picard.ui import PicardDialog
-@@ -206,7 +205,7 @@ class InterfaceOptionsPage(OptionsPage):
-         language_list = [(lang[0], lang[1], _(lang[2])) for lang in UI_LANGUAGES]
- 
-         def fcmp(x):
--            return strxfrm(x[2])
-+            return x[2]
-         for lang_code, native, translation in sorted(language_list, key=fcmp):
-             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 24c85e90..3c2c6fe9 100644
---- a/picard/ui/options/releases.py
-+++ b/picard/ui/options/releases.py
-@@ -43,7 +43,6 @@ from picard.const import (
-     RELEASE_SECONDARY_GROUPS,
- )
- from picard.const.sys import IS_WIN
--from picard.util import strxfrm
- 
- from picard.ui.options import (
-     OptionsPage,
-@@ -284,7 +283,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]
--- 
-2.36.1
-
diff --git a/media-sound/picard/picard-2.8.5.recipe b/media-sound/picard/picard-2.8.5.recipe
index 4e797a7fe..4c8a6d7bd 100644
--- a/media-sound/picard/picard-2.8.5.recipe
+++ b/media-sound/picard/picard-2.8.5.recipe
@@ -12,12 +12,11 @@ HOMEPAGE="https://picard.musicbrainz.org/"
 COPYRIGHT="2004-2022 Robert Kaye, Lukas Lalinsky, Laurent Monin, \
 Sambhav Kothari, Philipp Wolfer and others"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
 CHECKSUM_SHA256="b1c1f76d5fe92cb481f4362142c6a84f1cf45948e42cfd7c3d3beffd703c54ce"
 SOURCE_DIR="picard-release-$portVersion"
 SOURCE_FILENAME="picard-$portVersion"
-PATCHES="picard-$portVersion.patchset"
 ADDITIONAL_FILES="
 	picard.rdef.in
 	haikuicons.zip