haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 22:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

picard: release 2.7.2 (#6530)

Browse Source
This commit is contained in:
Philipp Wolfer
2022-01-11 20:25:16 +01:00
committed by GitHub
parent debcb73d2b
commit 7515c1125c
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
media-sound/picard/patches/picard-2.7.1.patchset → media-sound/picard/patches/picard-2.7.2.patchset
View File

@@ -1,15 +1,38 @@
From 731e74fe876b1a0be8ee5926168ff1f08b7eabd5 Mon Sep 17 00:00:00 2001
From 66540cd5abdb49d03f2f228b2fd09ddc5b1acca5 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 | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
index 44c5c480..56ed0810 100644
--- a/picard/ui/itemviews.py
+++ b/picard/ui/itemviews.py
@@ -47,7 +47,6 @@ from heapq import (
heappop,
heappush,
)
-from locale import strxfrm
from PyQt5 import (
QtCore,
@@ -922,7 +921,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 81fad103..4fca8cec 100644
index 3443c238..977ab693 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -30,7 +30,6 @@
@@ -20,7 +43,7 @@ index 81fad103..4fca8cec 100644
import os.path
from PyQt5 import (
@@ -204,7 +203,7 @@ class InterfaceOptionsPage(OptionsPage):
@@ -211,7 +210,7 @@ class InterfaceOptionsPage(OptionsPage):
language_list = [(lang[0], lang[1], _(lang[2])) for lang in UI_LANGUAGES]
def fcmp(x):
@@ -30,7 +53,7 @@ index 81fad103..4fca8cec 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 24f34180..21712fc4 100644
index 4a5610a8..ae5bc850 100644
--- a/picard/ui/options/releases.py
+++ b/picard/ui/options/releases.py
@@ -24,8 +24,6 @@
@@ -42,7 +65,7 @@ index 24f34180..21712fc4 100644
from operator import itemgetter
from PyQt5 import (
@@ -275,7 +273,7 @@ class ReleasesOptionsPage(OptionsPage):
@@ -284,7 +282,7 @@ class ReleasesOptionsPage(OptionsPage):
source_list = [(c[0], _(c[1])) for c in source.items()]
def fcmp(x):