mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
picard: release 2.7.2 (#6530)
This commit is contained in:
@@ -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>
|
From: Philipp Wolfer <ph.wolfer@gmail.com>
|
||||||
Date: Tue, 29 Jan 2019 11:33:18 +0000
|
Date: Tue, 29 Jan 2019 11:33:18 +0000
|
||||||
Subject: [PATCH 3/3] Haiku: Avoid using locale.strxfrm
|
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/interface.py | 3 +--
|
||||||
picard/ui/options/releases.py | 4 +---
|
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
|
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
|
--- a/picard/ui/options/interface.py
|
||||||
+++ b/picard/ui/options/interface.py
|
+++ b/picard/ui/options/interface.py
|
||||||
@@ -30,7 +30,6 @@
|
@@ -30,7 +30,6 @@
|
||||||
@@ -20,7 +43,7 @@ index 81fad103..4fca8cec 100644
|
|||||||
import os.path
|
import os.path
|
||||||
|
|
||||||
from PyQt5 import (
|
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]
|
language_list = [(lang[0], lang[1], _(lang[2])) for lang in UI_LANGUAGES]
|
||||||
|
|
||||||
def fcmp(x):
|
def fcmp(x):
|
||||||
@@ -30,7 +53,7 @@ index 81fad103..4fca8cec 100644
|
|||||||
if native and native != translation:
|
if native and native != translation:
|
||||||
name = '%s (%s)' % (translation, native)
|
name = '%s (%s)' % (translation, native)
|
||||||
diff --git a/picard/ui/options/releases.py b/picard/ui/options/releases.py
|
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
|
--- a/picard/ui/options/releases.py
|
||||||
+++ b/picard/ui/options/releases.py
|
+++ b/picard/ui/options/releases.py
|
||||||
@@ -24,8 +24,6 @@
|
@@ -24,8 +24,6 @@
|
||||||
@@ -42,7 +65,7 @@ index 24f34180..21712fc4 100644
|
|||||||
from operator import itemgetter
|
from operator import itemgetter
|
||||||
|
|
||||||
from PyQt5 import (
|
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()]
|
source_list = [(c[0], _(c[1])) for c in source.items()]
|
||||||
|
|
||||||
def fcmp(x):
|
def fcmp(x):
|
||||||
@@ -14,7 +14,7 @@ Sambhav Kothari, Philipp Wolfer and others"
|
|||||||
LICENSE="GNU GPL v2"
|
LICENSE="GNU GPL v2"
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
|
SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="78c880281bffd518996cbca726cc947e5584af2b66c9f546bcf3ba83d22d718c"
|
CHECKSUM_SHA256="73c70933f78de9a92ad8943d2e237d5f580d4f695c950d2070385f1067315e76"
|
||||||
SOURCE_DIR="picard-release-$portVersion"
|
SOURCE_DIR="picard-release-$portVersion"
|
||||||
SOURCE_FILENAME="picard-$portVersion"
|
SOURCE_FILENAME="picard-$portVersion"
|
||||||
PATCHES="picard-$portVersion.patchset"
|
PATCHES="picard-$portVersion.patchset"
|
||||||
Reference in New Issue
Block a user