picard: new recipe for version 2.1.3 (#4010)

This commit is contained in:
Philipp Wolfer
2019-07-18 18:03:52 +02:00
committed by Sergei Reznikov
parent 8d9cd527e9
commit 933f095da2
3 changed files with 272 additions and 0 deletions

View File

@@ -0,0 +1,75 @@
From b1cea68f3484eba249e6e2db8d7b6220e7601984 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 | 2 +-
picard/ui/options/releases.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
index 08fd264c..9ae9ed4b 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -138,7 +138,7 @@ class InterfaceOptionsPage(OptionsPage):
self.ui.ui_language.addItem(_('System default'), '')
language_list = [(l[0], l[1], _(l[2])) for l in UI_LANGUAGES]
- def fcmp(x): return locale.strxfrm(x[2])
+ def fcmp(x): 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 117391fc..839a2f20 100644
--- a/picard/ui/options/releases.py
+++ b/picard/ui/options/releases.py
@@ -255,7 +255,7 @@ class ReleasesOptionsPage(OptionsPage):
else:
source_list = [(c[0], _(c[1])) for c in source.items()]
- def fcmp(x): return strxfrm(x[1])
+ def fcmp(x): return x[1]
source_list.sort(key=fcmp)
saved_data = config.setting[setting]
move = []
--
2.21.0
From 75d7a1fea21f169da24e9b1003d6b9f928dcdb71 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 29 Jan 2019 11:35:33 +0000
Subject: [PATCH 2/2] Haiku: Use WebPositive as default browser
---
picard/util/webbrowser2.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/picard/util/webbrowser2.py b/picard/util/webbrowser2.py
index 7d003ccf..bacd8a13 100644
--- a/picard/util/webbrowser2.py
+++ b/picard/util/webbrowser2.py
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-from sys import version_info
+from sys import platform, version_info
import webbrowser
from PyQt5 import QtWidgets
@@ -32,6 +32,11 @@ in PyQt and also adds a utility function for opening Picard URLS.
"""
+if platform == "haiku1":
+ webpositive = webbrowser.GenericBrowser("WebPositive")
+ webbrowser.register("webpositive", None, webpositive, True)
+
+
def open(url):
try:
webbrowser.open(url)
--
2.21.0