diff options
| author | wiz <wiz> | 2010-10-29 09:28:12 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-10-29 09:28:12 +0000 |
| commit | 5585d2f3c4d443b701a4e8c603cd2b5111664f33 (patch) | |
| tree | 135c99eec2e15956b7cd8e3b42547df45abc3fdd /audio | |
| parent | 5d3f034cc2c952621173f8fd80696cba8e98bfe3 (diff) | |
| download | pkgsrc-5585d2f3c4d443b701a4e8c603cd2b5111664f33.tar.gz | |
Another bug fix from upstream, bump PKGREVISION.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/amarok/Makefile | 4 | ||||
| -rw-r--r-- | audio/amarok/distinfo | 4 | ||||
| -rw-r--r-- | audio/amarok/patches/patch-aa | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 077fb3a64d4..1be07563586 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.90 2010/10/27 07:59:32 wiz Exp $ +# $NetBSD: Makefile,v 1.91 2010/10/29 09:28:12 wiz Exp $ # DISTNAME= amarok-${VERS} VERS= 2.3.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio multimedia #MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \ # ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/ diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo index 23c979a36cb..059216f0682 100644 --- a/audio/amarok/distinfo +++ b/audio/amarok/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.44 2010/10/02 10:08:31 wiz Exp $ +$NetBSD: distinfo,v 1.45 2010/10/29 09:28:12 wiz Exp $ SHA1 (amarok-2.3.2.tar.bz2) = 594d6d3ad57832fb80ba4387459356132d37ace2 RMD160 (amarok-2.3.2.tar.bz2) = 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 Size (amarok-2.3.2.tar.bz2) = 13948250 bytes -SHA1 (patch-aa) = 30de693fabd0ac8637c049e5357fd08fadd4ceed +SHA1 (patch-aa) = da74bc41dc18286cabef82fef9b5aa4f738e8ad5 SHA1 (patch-ab) = 152a6c0516dcab316c4f90480f1bb7fb46eabfbe SHA1 (patch-ac) = 22c385f4633a828dd6b812e461836c1a1284c1a6 SHA1 (patch-ad) = 682691c8f730df13a0a3424a91fda0898fc2626e diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa index c5d04a0aabc..d52c1c9e18b 100644 --- a/audio/amarok/patches/patch-aa +++ b/audio/amarok/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.20 2010/09/24 09:44:52 wiz Exp $ +$NetBSD: patch-aa,v 1.21 2010/10/29 09:28:13 wiz Exp $ -Two fixes from upstream: +Three fixes from upstream: BPM bugfix for FLAC fils, amarok commit ce57e426. @@ -10,6 +10,9 @@ XML, even if you tel l them to. Also switch to QXmlStreamWriter, as apparently going forward it is the more supported class. BUG: 251762, commmit 79d86829294ac54132c01153660e70e30c15c378 (I think). +Fix for previous from +http://gitweb.kde.org/amarok.git/blobdiff_plain/0b8577293698f88f2c6e5a1661ba570d0dd264b5..182f39c15575c3c1ce2b0425f9e3ec5997f3a9fd:/utilities/collectionscanner/CollectionScanner.cpp + --- utilities/collectionscanner/CollectionScanner.cpp.orig 2010-09-24 09:21:46.000000000 +0000 +++ utilities/collectionscanner/CollectionScanner.cpp @@ -37,13 +37,13 @@ @@ -48,7 +51,7 @@ as apparently going forward it is the more supported class. BUG: + if( data[i].category() == QChar::NoCategory || + data[i].category() == QChar::Other_Surrogate || + ( -+ data[i].unicode() < 20 && ++ data[i].unicode() < 32 && + data[i].unicode() != 9 && + data[i].unicode() != 10 && + data[i].unicode() != 13 |