Picard revbump for pyqt (#4234)

This commit is contained in:
miqlas
2019-10-09 17:21:59 +02:00
committed by Jérôme Duval
parent d420cc1fe3
commit cebed0441d
2 changed files with 8 additions and 40 deletions

View File

@@ -36,35 +36,3 @@ index 857b7850..d3decda5 100644
move = []
--
2.23.0
From 58b389cffecca65ef916aa4986424e4c413e436f 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 5/6] Haiku: open URLs with default browser Try opening URLs
with "open", fall back to WebPositive
---
picard/util/webbrowser2.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/picard/util/webbrowser2.py b/picard/util/webbrowser2.py
index c7426918..f087b462 100644
--- a/picard/util/webbrowser2.py
+++ b/picard/util/webbrowser2.py
@@ -29,6 +29,14 @@ from PyQt5 import QtWidgets
from picard import log
from picard.const import PICARD_URLS
+from picard.const.sys import IS_HAIKU
+
+
+if IS_HAIKU:
+ haiku_default = webbrowser.GenericBrowser("open")
+ webbrowser.register("haiku-default", None, haiku_default, True)
+ webpositive = webbrowser.GenericBrowser("WebPositive")
+ webbrowser.register("webpositive", None, webpositive)
def open(url):
--
2.23.0

View File

@@ -12,7 +12,7 @@ HOMEPAGE="https://picard.musicbrainz.org/"
COPYRIGHT="2004-2019 Robert Kaye, Lukas Lalinsky, Laurent Monin, \
Sambhav Kothari, Philipp Wolfer and others"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
CHECKSUM_SHA256="eac065db0c2bd84e34aeb061602cf1f188b602744015905fb498596acfd426b0"
SOURCE_DIR="picard-release-$portVersion"
@@ -29,33 +29,33 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
cmd:fpcalc
cmd:python3.6
discid_python36
cmd:python3.7
discid_python3
lib:libdiscid$secondaryArchSuffix
mutagen_python36
mutagen_python3
pyqt_python3
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
setuptools_python36
setuptools_python3
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:msgfmt$secondaryArchSuffix
cmd:python3.6
cmd:python3.7
"
BUILD()
{
LC_ALL=en_US.UTF-8
python3.6 setup.py config
python3 setup.py config
}
INSTALL()
{
LC_ALL=en_US.UTF-8
python3.6 setup.py install \
python3 setup.py install \
--root=/ --prefix=$prefix \
--install-data=$dataDir \
--install-locales=$dataDir/share/locale/ \