[arch-commits] Commit in picard/trunk (PKGBUILD mutagen-1.34.patch)
Gaëtan Bisson
bisson at archlinux.org
Tue Feb 14 20:08:42 UTC 2017
Date: Tuesday, February 14, 2017 @ 20:08:41
Author: bisson
Revision: 212468
upstream update
Modified:
picard/trunk/PKGBUILD
Deleted:
picard/trunk/mutagen-1.34.patch
--------------------+
PKGBUILD | 16 +++-----------
mutagen-1.34.patch | 56 ---------------------------------------------------
2 files changed, 4 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-14 19:18:00 UTC (rev 212467)
+++ PKGBUILD 2017-02-14 20:08:41 UTC (rev 212468)
@@ -4,8 +4,8 @@
# Contributor: sysrq
pkgname=picard
-pkgver=1.3.2
-pkgrel=5
+pkgver=1.4
+pkgrel=1
pkgdesc='Official MusicBrainz tagger'
url='http://picard.musicbrainz.org/'
license=('GPL')
@@ -14,16 +14,9 @@
optdepends=('chromaprint: fingerprinting'
'python2-discid: cd lookup')
makedepends=('python2-discid')
-source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'mutagen-1.34.patch')
-sha1sums=('084fdb184cb1d970dce953dd6c684932d464bf54'
- 'a58b5843141aeff64c2f4b688645394321ee49b7')
+source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('030f54e2136781645075e82a1002e9c8e7545057')
-prepare() {
- cd "${srcdir}/picard-release-${pkgver}"
- patch -p1 -i ../mutagen-1.34.patch
-}
-
build() {
cd "${srcdir}/picard-release-${pkgver}"
python2 setup.py config
@@ -32,5 +25,4 @@
package() {
cd "${srcdir}/picard-release-${pkgver}"
python2 setup.py install --root="${pkgdir}"
- cp -r contrib/plugins/* "${pkgdir}/usr/lib/python2.7/site-packages/picard/plugins/"
}
Deleted: mutagen-1.34.patch
===================================================================
--- mutagen-1.34.patch 2017-02-14 19:18:00 UTC (rev 212467)
+++ mutagen-1.34.patch 2017-02-14 20:08:41 UTC (rev 212468)
@@ -1,56 +0,0 @@
-diff -ur old/picard/formats/id3.py new/picard/formats/id3.py
---- old/picard/formats/id3.py 2015-01-06 23:01:43.000000000 +0100
-+++ new/picard/formats/id3.py 2016-08-08 12:09:32.613315575 +0200
-@@ -35,23 +35,23 @@
- # Ugly, but... I need to save the text in ISO-8859-1 even if it contains
- # unsupported characters and this better than encoding, decoding and
- # again encoding.
--def patched_EncodedTextSpec_write(self, frame, value):
-+def patched_EncodedTextSpec_write(self, config, frame, value):
- try:
- enc, term = self._encodings[frame.encoding]
- except AttributeError:
- enc, term = self.encodings[frame.encoding]
- return value.encode(enc, 'ignore') + term
-
--id3.EncodedTextSpec.write = patched_EncodedTextSpec_write
-+id3._specs.EncodedTextSpec.write = patched_EncodedTextSpec_write
-
-
- # One more "monkey patch". The ID3 spec says that multiple text
- # values should be _separated_ by the string terminator, which
- # means that e.g. 'a\x00' are two values, 'a' and ''.
--def patched_MultiSpec_write(self, frame, value):
-- data = self._write_orig(frame, value)
-+def patched_MultiSpec_write(self, config, frame, value):
-+ data = self._write_orig(config, frame, value)
- spec = self.specs[-1]
-- if isinstance(spec, id3.EncodedTextSpec):
-+ if isinstance(spec, id3._specs.EncodedTextSpec):
- try:
- term = spec._encodings[frame.encoding][1]
- except AttributeError:
-@@ -61,8 +61,8 @@
- return data
-
-
--id3.MultiSpec._write_orig = id3.MultiSpec.write
--id3.MultiSpec.write = patched_MultiSpec_write
-+id3._specs.MultiSpec._write_orig = id3._specs.MultiSpec.write
-+id3._specs.MultiSpec.write = patched_MultiSpec_write
-
-
- id3.TCMP = compatid3.TCMP
-diff -ur old/picard/formats/mutagenext/compatid3.py new/picard/formats/mutagenext/compatid3.py
---- old/picard/formats/mutagenext/compatid3.py 2016-08-08 09:57:59.177734598 +0200
-+++ new/picard/formats/mutagenext/compatid3.py 2016-08-08 12:09:32.613315575 +0200
-@@ -23,7 +23,8 @@
- import mutagen
- from mutagen._util import insert_bytes
- from mutagen.id3 import ID3, Frames, Frames_2_2, TextFrame, TORY, \
-- TYER, TIME, APIC, IPLS, TDAT, BitPaddedInt, MakeID3v1
-+ TYER, TIME, APIC, IPLS, TDAT, MakeID3v1
-+from mutagen.id3._util import BitPaddedInt
-
-
- class TCMP(TextFrame):
More information about the arch-commits
mailing list