mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
picard: bump version to 2.8.1 (#6985)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 9f2ec058ff6cf81e08994a8c4b936e7f4496fb5d Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
@@ -7,21 +7,21 @@ On Haiku this causes frequent core dumps
|
||||
---
|
||||
picard/ui/itemviews.py | 3 +--
|
||||
picard/ui/options/interface.py | 3 +--
|
||||
picard/ui/options/releases.py | 4 +---
|
||||
3 files changed, 3 insertions(+), 7 deletions(-)
|
||||
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 03b1537f..4ead4146 100644
|
||||
index ed4d6f56..4ead4146 100644
|
||||
--- a/picard/ui/itemviews.py
|
||||
+++ b/picard/ui/itemviews.py
|
||||
@@ -47,7 +47,6 @@ from heapq import (
|
||||
heappop,
|
||||
heappush,
|
||||
@@ -84,7 +84,6 @@ from picard.util import (
|
||||
natsort,
|
||||
normpath,
|
||||
restore_method,
|
||||
- strxfrm,
|
||||
)
|
||||
-from locale import strxfrm
|
||||
|
||||
from PyQt5 import (
|
||||
QtCore,
|
||||
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))
|
||||
@@ -32,40 +32,39 @@ index 03b1537f..4ead4146 100644
|
||||
return sortkey
|
||||
|
||||
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
|
||||
index b12f5c1e..40480812 100644
|
||||
index 38616a98..d72b1a8a 100644
|
||||
--- a/picard/ui/options/interface.py
|
||||
+++ b/picard/ui/options/interface.py
|
||||
@@ -29,7 +29,6 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
@@ -47,7 +47,6 @@ from picard.const import UI_LANGUAGES
|
||||
from picard.const.sys import IS_MACOS
|
||||
from picard.util import (
|
||||
icontheme,
|
||||
- strxfrm,
|
||||
)
|
||||
|
||||
|
||||
-import locale
|
||||
import os.path
|
||||
|
||||
from PyQt5 import (
|
||||
@@ -204,7 +203,7 @@ class InterfaceOptionsPage(OptionsPage):
|
||||
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 locale.strxfrm(x[2])
|
||||
- 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 754c3ea8..b65d606a 100644
|
||||
index 24c85e90..3c2c6fe9 100644
|
||||
--- a/picard/ui/options/releases.py
|
||||
+++ b/picard/ui/options/releases.py
|
||||
@@ -24,8 +24,6 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
@@ -43,7 +43,6 @@ from picard.const import (
|
||||
RELEASE_SECONDARY_GROUPS,
|
||||
)
|
||||
from picard.const.sys import IS_WIN
|
||||
-from picard.util import strxfrm
|
||||
|
||||
-
|
||||
-from locale import strxfrm
|
||||
from operator import itemgetter
|
||||
|
||||
from PyQt5 import (
|
||||
@@ -284,7 +282,7 @@ class ReleasesOptionsPage(OptionsPage):
|
||||
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):
|
||||
@@ -14,7 +14,7 @@ Sambhav Kothari, Philipp Wolfer and others"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="ee6b9b160fcef12957f018410922909b21004627f67e6de637a063b877e2674e"
|
||||
CHECKSUM_SHA256="4ed401201878a6bf8757ec7fef6b75411b525d3818eb46308491e63eac7c62b7"
|
||||
SOURCE_DIR="picard-release-$portVersion"
|
||||
SOURCE_FILENAME="picard-$portVersion"
|
||||
PATCHES="picard-$portVersion.patchset"
|
||||
Reference in New Issue
Block a user