diff --git a/media-sound/picard/patches/picard-2.3.2.patchset b/media-sound/picard/patches/picard-2.4.patchset similarity index 59% rename from media-sound/picard/patches/picard-2.3.2.patchset rename to media-sound/picard/patches/picard-2.4.patchset index 426d83a35..f0a3be997 100644 --- a/media-sound/picard/patches/picard-2.3.2.patchset +++ b/media-sound/picard/patches/picard-2.4.patchset @@ -1,7 +1,7 @@ -From a587e5c79986951943de6be0a4e3b40ed050d7c5 Mon Sep 17 00:00:00 2001 +From 772e964be57e7e4f6403a5ed656f8c3e5d7d07c0 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 29 Jan 2019 11:33:18 +0000 -Subject: [PATCH 1/2] Haiku: Avoid using locale.strxfrm +Subject: [PATCH] Haiku: Avoid using locale.strxfrm --- picard/ui/options/interface.py | 3 +-- @@ -9,7 +9,7 @@ Subject: [PATCH 1/2] Haiku: Avoid using locale.strxfrm 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py -index 3cbc077a..310656f1 100644 +index 602c234c..adb94b0b 100644 --- a/picard/ui/options/interface.py +++ b/picard/ui/options/interface.py @@ -29,7 +29,6 @@ @@ -21,7 +21,7 @@ index 3cbc077a..310656f1 100644 from PyQt5 import ( @@ -156,7 +155,7 @@ class InterfaceOptionsPage(OptionsPage): - language_list = [(l[0], l[1], _(l[2])) for l in UI_LANGUAGES] + language_list = [(lang[0], lang[1], _(lang[2])) for lang in UI_LANGUAGES] def fcmp(x): - return locale.strxfrm(x[2]) @@ -52,30 +52,5 @@ index 21524096..42ebf942 100644 saved_data = config.setting[setting] move = [] -- -2.24.1 - -From 25bcf75e53894dee092df699c60afe128940c9ee Mon Sep 17 00:00:00 2001 -From: Philipp Wolfer -Date: Mon, 17 Feb 2020 23:20:47 +0000 -Subject: [PATCH 2/2] Haiku: Raise window after FileOpen event - ---- - picard/tagger.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/picard/tagger.py b/picard/tagger.py -index f313ea07..4f6b3517 100644 ---- a/picard/tagger.py -+++ b/picard/tagger.py -@@ -419,6 +419,8 @@ class Tagger(QtWidgets.QApplication): - self.add_directory(file) - else: - self.add_files([file]) -+ if IS_HAIKU: -+ self.bring_tagger_front() - # We should just return True here, except that seems to - # cause the event's sender to get a -9874 error, so - # apparently there's some magic inside QFileOpenEvent... --- -2.24.1 +2.26.0 diff --git a/media-sound/picard/picard-2.3.2.recipe b/media-sound/picard/picard-2.4.recipe similarity index 94% rename from media-sound/picard/picard-2.3.2.recipe rename to media-sound/picard/picard-2.4.recipe index c910cb785..bee25bed4 100644 --- a/media-sound/picard/picard-2.3.2.recipe +++ b/media-sound/picard/picard-2.4.recipe @@ -12,10 +12,11 @@ HOMEPAGE="https://picard.musicbrainz.org/" COPYRIGHT="2004-2020 Robert Kaye, Lukas Lalinsky, Laurent Monin, \ Sambhav Kothari, Philipp Wolfer and others" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz" -CHECKSUM_SHA256="a91d9f11f2e5a6a0c579e0749e3a3919694ddeef0f251c1dded32e9331b1b0b7" +CHECKSUM_SHA256="0c96fd47940f85ce4ebf73409624eb2c9d46a6a073c740c816d2592e87bedc23" SOURCE_DIR="picard-release-$portVersion" +SOURCE_FILENAME="picard" PATCHES="picard-$portVersion.patchset" ADDITIONAL_FILES=" picard.rdef.in @@ -33,8 +34,10 @@ REQUIRES=" haiku$secondaryArchSuffix cmd:fpcalc cmd:python3.7 + dateutil_python3 discid_python3 lib:libdiscid$secondaryArchSuffix + markdown_python3 mutagen_python3 pyqt_python3 "