* [gentoo-commits] repo/gentoo:master commit in: media-sound/picard/files/, media-sound/picard/
@ 2018-08-22 8:02 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-08-22 8:02 UTC (permalink / raw
To: gentoo-commits
commit: bd15cc99b4e69086b509032ccb175d8257022626
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 08:02:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 08:02:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd15cc99
media-sound/picard: 2.0.3 version bump
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-sound/picard/Manifest | 1 +
.../picard/files/picard-2.0.3-crashfix.patch | 23 ++++++
.../files/picard-2.0.3-iteration-error.patch | 24 +++++++
media-sound/picard/picard-2.0.3.ebuild | 83 ++++++++++++++++++++++
4 files changed, 131 insertions(+)
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index ec82c867d3f..bf3d515739c 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1 +1,2 @@
DIST picard-2.0.0_beta3.tar.gz 2686246 BLAKE2B e11cc85282bb3dfe7298090e42b62f7e9b2d4ee7df09b040905665694074ede611884e1544abc89aa3d07e0844d6599d5fac7c0db09bad7d9e64439c0c4478c9 SHA512 c8c5bdd84af3946bc24eb495bcb83877dffedb81e6ff64742925f6d1b4f2780f86280dda839d96030ea15ee2a7bf7708c20cc4ac92e97bf9cd372ea36715d156
+DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
diff --git a/media-sound/picard/files/picard-2.0.3-crashfix.patch b/media-sound/picard/files/picard-2.0.3-crashfix.patch
new file mode 100644
index 00000000000..33c33177821
--- /dev/null
+++ b/media-sound/picard/files/picard-2.0.3-crashfix.patch
@@ -0,0 +1,23 @@
+From 24722cc47cc9e968eb05becf6056517b23e81e34 Mon Sep 17 00:00:00 2001
+From: Sambhav Kothari <sambhavs.email@gmail.com>
+Date: Sun, 12 Aug 2018 18:06:58 +0100
+Subject: [PATCH] PICARD-1310: Fix crash on clearing the log, due to wrong var.
+ name
+
+---
+ picard/log.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/picard/log.py b/picard/log.py
+index 5974a8a8c..a388af554 100644
+--- a/picard/log.py
++++ b/picard/log.py
+@@ -90,7 +90,7 @@ def contents(self, prev=-1):
+ return contents
+
+ def clear(self):
+- with self.log_queue_lock:
++ with self._queue_lock:
+ self._log_queue.clear()
+
+
diff --git a/media-sound/picard/files/picard-2.0.3-iteration-error.patch b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
new file mode 100644
index 00000000000..36e0b8092c5
--- /dev/null
+++ b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
@@ -0,0 +1,24 @@
+From c5f8237bba87dcf113e41cd53a723ce1dad2c3dd Mon Sep 17 00:00:00 2001
+From: Laurent Monin <github@norz.org>
+Date: Mon, 20 Aug 2018 14:08:11 +0200
+Subject: [PATCH] PICARD-1318: Fix dictionary changed size during iteration
+ error
+
+It happens when looking up a track with script $set(newartists, %artists%)
+---
+ picard/metadata.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/picard/metadata.py b/picard/metadata.py
+index 8e2aa5266..4f9269b0c 100644
+--- a/picard/metadata.py
++++ b/picard/metadata.py
+@@ -333,7 +333,7 @@ def rawitems(self):
+ def apply_func(self, func):
+ for key, values in self.rawitems():
+ if key not in PRESERVED_TAGS:
+- self[key] = [func(value) for value in values]
++ super().__setitem__(key, [func(value) for value in values])
+
+ def strip_whitespace(self):
+ """Strip leading/trailing whitespace.
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
new file mode 100644
index 00000000000..4db7f7a110a
--- /dev/null
+++ b/media-sound/picard/picard-2.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+
+inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+ dev-qt/qtgui:5[accessibility]
+ >=media-libs/mutagen-1.38"
+DEPEND="
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-crashfix.patch"
+ "${FILESDIR}/${P}-iteration-error.patch"
+)
+
+python_compile() {
+ local build_args=(
+ --disable-autoupdate
+ )
+ if ! use nls; then
+ build_args+=( --disable-locales )
+ fi
+ distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+ local install_args=(
+ --disable-autoupdate
+ --skip-build
+ )
+ if ! use nls; then
+ install_args+=( --disable-locales )
+ fi
+ distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
+calculation and lookup of AcoustID fingerprints.
+
+Install optional package dev-python/python-discid to enable
+calculation and lookup of compact disc identifiers (disc IDs).
+
+If you are upgrading Picard and it does not start, try removing
+Picard's settings:
+ rm ~/.config/MusicBrainz/Picard.conf"
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/picard/files/, media-sound/picard/
@ 2019-01-28 16:13 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2019-01-28 16:13 UTC (permalink / raw
To: gentoo-commits
commit: fbc4f87d196cac00a3788a2b7506a60e098902ac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 11:26:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 16:12:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc4f87d
media-sound/picard: Drop 2.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-sound/picard/Manifest | 1 -
.../picard/files/picard-2.0.3-crashfix.patch | 23 ------
.../files/picard-2.0.3-iteration-error.patch | 24 -------
media-sound/picard/picard-2.0.3.ebuild | 83 ----------------------
4 files changed, 131 deletions(-)
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index fbc6a04f977..f8e589f5438 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,2 +1 @@
-DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
diff --git a/media-sound/picard/files/picard-2.0.3-crashfix.patch b/media-sound/picard/files/picard-2.0.3-crashfix.patch
deleted file mode 100644
index 33c33177821..00000000000
--- a/media-sound/picard/files/picard-2.0.3-crashfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 24722cc47cc9e968eb05becf6056517b23e81e34 Mon Sep 17 00:00:00 2001
-From: Sambhav Kothari <sambhavs.email@gmail.com>
-Date: Sun, 12 Aug 2018 18:06:58 +0100
-Subject: [PATCH] PICARD-1310: Fix crash on clearing the log, due to wrong var.
- name
-
----
- picard/log.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/picard/log.py b/picard/log.py
-index 5974a8a8c..a388af554 100644
---- a/picard/log.py
-+++ b/picard/log.py
-@@ -90,7 +90,7 @@ def contents(self, prev=-1):
- return contents
-
- def clear(self):
-- with self.log_queue_lock:
-+ with self._queue_lock:
- self._log_queue.clear()
-
-
diff --git a/media-sound/picard/files/picard-2.0.3-iteration-error.patch b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
deleted file mode 100644
index 36e0b8092c5..00000000000
--- a/media-sound/picard/files/picard-2.0.3-iteration-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c5f8237bba87dcf113e41cd53a723ce1dad2c3dd Mon Sep 17 00:00:00 2001
-From: Laurent Monin <github@norz.org>
-Date: Mon, 20 Aug 2018 14:08:11 +0200
-Subject: [PATCH] PICARD-1318: Fix dictionary changed size during iteration
- error
-
-It happens when looking up a track with script $set(newartists, %artists%)
----
- picard/metadata.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/picard/metadata.py b/picard/metadata.py
-index 8e2aa5266..4f9269b0c 100644
---- a/picard/metadata.py
-+++ b/picard/metadata.py
-@@ -333,7 +333,7 @@ def rawitems(self):
- def apply_func(self, func):
- for key, values in self.rawitems():
- if key not in PRESERVED_TAGS:
-- self[key] = [func(value) for value in values]
-+ super().__setitem__(key, [func(value) for value in values])
-
- def strip_whitespace(self):
- """Strip leading/trailing whitespace.
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
deleted file mode 100644
index c81de29bc6b..00000000000
--- a/media-sound/picard/picard-2.0.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="A cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="
- dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
- dev-qt/qtgui:5[accessibility]
- >=media-libs/mutagen-1.38"
-DEPEND="
- nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-crashfix.patch"
- "${FILESDIR}/${P}-iteration-error.patch"
-)
-
-python_compile() {
- local build_args=(
- --disable-autoupdate
- )
- if ! use nls; then
- build_args+=( --disable-locales )
- fi
- distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
- local install_args=(
- --disable-autoupdate
- --skip-build
- )
- if ! use nls; then
- install_args+=( --disable-locales )
- fi
- distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
- rm ~/.config/MusicBrainz/Picard.conf"
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-28 19:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-22 8:02 [gentoo-commits] repo/gentoo:master commit in: media-sound/picard/files/, media-sound/picard/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-01-28 16:13 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox