diff --git a/media-sound/picard/additional-files/picard.rdef.in b/media-sound/picard/additional-files/picard.rdef.in index 24a548df8..3456e350c 100644 --- a/media-sound/picard/additional-files/picard.rdef.in +++ b/media-sound/picard/additional-files/picard.rdef.in @@ -45,7 +45,8 @@ resource file_types message { "types" = "video/ogg", "types" = "video/x-ms-asf", "types" = "video/x-theora", - "types" = "video/x-wmv" + "types" = "video/x-wmv", + "types" = "application/x-vnd.Be-directory" }; resource vector_icon array { diff --git a/media-sound/picard/patches/picard-2.2.3.patchset b/media-sound/picard/patches/picard-2.2.3.patchset deleted file mode 100644 index 3703729b2..000000000 --- a/media-sound/picard/patches/picard-2.2.3.patchset +++ /dev/null @@ -1,65 +0,0 @@ -From 30d08591efc2b98e9c969a78d16756ae1767a320 Mon Sep 17 00:00:00 2001 -From: Philipp Wolfer -Date: Tue, 29 Jan 2019 11:33:18 +0000 -Subject: [PATCH 3/6] 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 16e6f49e..2ed78c80 100644 ---- a/picard/ui/options/interface.py -+++ b/picard/ui/options/interface.py -@@ -141,7 +141,7 @@ class InterfaceOptionsPage(OptionsPage): - language_list = [(l[0], l[1], _(l[2])) for l in UI_LANGUAGES] - - def fcmp(x): -- return locale.strxfrm(x[2]) -+ 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 857b7850..d3decda5 100644 ---- a/picard/ui/options/releases.py -+++ b/picard/ui/options/releases.py -@@ -261,7 +261,7 @@ class ReleasesOptionsPage(OptionsPage): - source_list = [(c[0], _(c[1])) for c in source.items()] - - def fcmp(x): -- return strxfrm(x[1]) -+ return x[1] - source_list.sort(key=fcmp) - saved_data = config.setting[setting] - move = [] --- -2.23.0 - -From b240d3d6dc668dca0408807053633e432d48660c Mon Sep 17 00:00:00 2001 -From: Philipp Wolfer -Date: Thu, 9 Jan 2020 08:11:49 +0000 -Subject: [PATCH 5/5] Fix initialization of QApplication with argv - ---- - picard/tagger.py | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/picard/tagger.py b/picard/tagger.py -index 65a2a985..f43c48bb 100644 ---- a/picard/tagger.py -+++ b/picard/tagger.py -@@ -143,9 +143,7 @@ class Tagger(QtWidgets.QApplication): - if not IS_MACOS and not IS_HAIKU: - self.setStyle('Fusion') - -- # Set the WM_CLASS to 'MusicBrainz-Picard' so desktop environments -- # can use it to look up the app -- super().__init__(['MusicBrainz-Picard'] + unparsed_args) -+ super().__init__(sys.argv) - self.__class__.__instance = self - config._setup(self, picard_args.config_file) - --- -2.24.1 diff --git a/media-sound/picard/patches/picard-2.3.patchset b/media-sound/picard/patches/picard-2.3.patchset new file mode 100644 index 000000000..7347bf0ac --- /dev/null +++ b/media-sound/picard/patches/picard-2.3.patchset @@ -0,0 +1,80 @@ +From 8cf65cdba69956cf05ac70300960b2733f1a686e 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 + +--- + picard/ui/options/interface.py | 3 +-- + picard/ui/options/releases.py | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py +index 7a543642..fb0bebb9 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. + + from functools import partial +-import locale + import os.path + + from PyQt5 import ( +@@ -145,7 +144,7 @@ class InterfaceOptionsPage(OptionsPage): + language_list = [(l[0], l[1], _(l[2])) for l in UI_LANGUAGES] + + def fcmp(x): +- return locale.strxfrm(x[2]) ++ 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 1432b898..a684c57e 100644 +--- a/picard/ui/options/releases.py ++++ b/picard/ui/options/releases.py +@@ -17,7 +17,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): + source_list = [(c[0], _(c[1])) for c in source.items()] + + def fcmp(x): +- return strxfrm(x[1]) ++ return x[1] + source_list.sort(key=fcmp) + saved_data = config.setting[setting] + move = [] +-- +2.24.1 + +From 8fffb05511ce70ace6a2e1dbfee79c0c1189b95d 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 7d372028..5ea0fe2a 100644 +--- a/picard/tagger.py ++++ b/picard/tagger.py +@@ -396,6 +396,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 + diff --git a/media-sound/picard/picard-2.2.3.recipe b/media-sound/picard/picard-2.3.recipe similarity index 94% rename from media-sound/picard/picard-2.2.3.recipe rename to media-sound/picard/picard-2.3.recipe index bb1b68b09..89923be23 100644 --- a/media-sound/picard/picard-2.2.3.recipe +++ b/media-sound/picard/picard-2.3.recipe @@ -12,9 +12,9 @@ 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="2" +REVISION="1" SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz" -CHECKSUM_SHA256="920bc0ffc1b5ae395456698a133799aee06c66b4446f6a388a64046e07d8716b" +CHECKSUM_SHA256="2c801e041dff49c5cbe844708f25fa1875af5866944083fc47373b31e375159d" SOURCE_DIR="picard-release-$portVersion" PATCHES="picard-$portVersion.patchset" ADDITIONAL_FILES="picard.rdef.in" @@ -68,6 +68,7 @@ INSTALL() local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" + if [ -z "$MINOR"]; then MINOR=0; fi sed \ -e "s|@MAJOR@|$MAJOR|" \