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.3.1 (#4762)

Browse Source
This commit is contained in:
Philipp Wolfer
2020-02-27 20:59:51 +00:00
committed by GitHub
parent 4ee8b57e7f
commit 00369b3072
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media-sound/picard/patches/picard-2.3.patchset → media-sound/picard/patches/picard-2.3.1.patchset
View File

@@ -1,26 +1,26 @@
From 8cf65cdba69956cf05ac70300960b2733f1a686e Mon Sep 17 00:00:00 2001
From a587e5c79986951943de6be0a4e3b40ed050d7c5 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 1/2] Haiku: Avoid using locale.strxfrm
---
picard/ui/options/interface.py | 3 +--
picard/ui/options/releases.py | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
picard/ui/options/releases.py | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
index 7a543642..fb0bebb9 100644
index 3cbc077a..310656f1 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -18,7 +18,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -29,7 +29,6 @@
from functools import partial
-import locale
import os.path
from PyQt5 import (
@@ -145,7 +144,7 @@ class InterfaceOptionsPage(OptionsPage):
@@ -156,7 +155,7 @@ class InterfaceOptionsPage(OptionsPage):
language_list = [(l[0], l[1], _(l[2])) for l in UI_LANGUAGES]
def fcmp(x):
@@ -30,18 +30,19 @@ index 7a543642..fb0bebb9 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 1432b898..a684c57e 100644
index 21524096..42ebf942 100644
--- a/picard/ui/options/releases.py
+++ b/picard/ui/options/releases.py
@@ -17,7 +17,6 @@
@@ -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.
-
-from locale import strxfrm
from operator import itemgetter
from PyQt5 import (
@@ -262,7 +261,7 @@ class ReleasesOptionsPage(OptionsPage):
@@ -270,7 +268,7 @@ class ReleasesOptionsPage(OptionsPage):
source_list = [(c[0], _(c[1])) for c in source.items()]
def fcmp(x):
@@ -53,7 +54,7 @@ index 1432b898..a684c57e 100644
--
2.24.1
From 8fffb05511ce70ace6a2e1dbfee79c0c1189b95d Mon Sep 17 00:00:00 2001
From 25bcf75e53894dee092df699c60afe128940c9ee Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 17 Feb 2020 23:20:47 +0000
Subject: [PATCH 2/2] Haiku: Raise window after FileOpen event
@@ -63,10 +64,10 @@ Subject: [PATCH 2/2] Haiku: Raise window after FileOpen event
1 file changed, 2 insertions(+)
diff --git a/picard/tagger.py b/picard/tagger.py
index 7d372028..5ea0fe2a 100644
index f313ea07..4f6b3517 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -396,6 +396,8 @@ class Tagger(QtWidgets.QApplication):
@@ -419,6 +419,8 @@ class Tagger(QtWidgets.QApplication):
self.add_directory(file)
else:
self.add_files([file])