diff options
Diffstat (limited to 'media-sound/amarokfs')
| -rw-r--r-- | media-sound/amarokfs/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/amarokfs/Manifest | 30 | ||||
| -rw-r--r-- | media-sound/amarokfs/amarokfs-0.5.ebuild | 4 | ||||
| -rw-r--r-- | media-sound/amarokfs/files/amarokfs-0.5-FixMountPointIdQuery.patch | 18 |
4 files changed, 48 insertions, 10 deletions
diff --git a/media-sound/amarokfs/ChangeLog b/media-sound/amarokfs/ChangeLog index 8e24e2105a75..c61a852499ae 100644 --- a/media-sound/amarokfs/ChangeLog +++ b/media-sound/amarokfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/amarokfs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/ChangeLog,v 1.7 2007/04/28 15:36:04 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/ChangeLog,v 1.8 2007/05/22 21:36:58 philantrop Exp $ + + 22 May 2007; Wulf C. Krueger <philantrop@gentoo.org> + +files/amarokfs-0.5-FixMountPointIdQuery.patch, amarokfs-0.5.ebuild: + Added a patch to fix problems with displaying covers. Fixes bug 175432. 28 Apr 2007; Carsten Lohrke <carlo@gentoo.org> amarokfs-0.4.2.ebuild, amarokfs-0.5.ebuild: diff --git a/media-sound/amarokfs/Manifest b/media-sound/amarokfs/Manifest index 1df631fe1cfb..658ee7688921 100644 --- a/media-sound/amarokfs/Manifest +++ b/media-sound/amarokfs/Manifest @@ -1,17 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX amarokfs-0.5-FixMountPointIdQuery.patch 1224 RMD160 bc1a10edc5cf28ee4c5fb5a297172ec763f1aacf SHA1 2359311f7bd3045ec192639cac9fbf016113a715 SHA256 99dee9a02c6c44d1fee8c153f3a41742347df8afce52ac0e81648668336bcbd1 +MD5 3bee0236b1b43a5410839c7345213828 files/amarokfs-0.5-FixMountPointIdQuery.patch 1224 +RMD160 bc1a10edc5cf28ee4c5fb5a297172ec763f1aacf files/amarokfs-0.5-FixMountPointIdQuery.patch 1224 +SHA256 99dee9a02c6c44d1fee8c153f3a41742347df8afce52ac0e81648668336bcbd1 files/amarokfs-0.5-FixMountPointIdQuery.patch 1224 DIST 52641-amarokFS-0.5.tar.gz 373310 RMD160 ea2052c4114c1db21e5f727bd9d3c96caddd97d4 SHA1 367b59ee271ad367b45f0b705feb94f2cb7d3fa0 SHA256 52ee9b21d18b7d76999b25c1de3077d3f2ae774b18b8eca3d9605ceaf340cafc DIST 52641-amarokFS-qt3-0.4.2.tar.gz 206259 RMD160 653e4554c85524ff71e8170c68c7347c2691e7aa SHA1 1def465f142670cb3349e3ef832931d621b32533 SHA256 285ea7c284272b55783e6d4c5809568e57155a960035864a3490aae859fa199e EBUILD amarokfs-0.4.2.ebuild 1479 RMD160 a689fa370d7e259cef0158c45dcc4fb4cde2440e SHA1 1559fc9c4434aa65162e1a9d20e7ccc5074848d3 SHA256 5efc2b24382d7f037a4fb0302ae0040d70abf890dac60520ff24008cd1ebd83c MD5 6dae740e22e13b72c2b5f8ec2d8e280c amarokfs-0.4.2.ebuild 1479 RMD160 a689fa370d7e259cef0158c45dcc4fb4cde2440e amarokfs-0.4.2.ebuild 1479 SHA256 5efc2b24382d7f037a4fb0302ae0040d70abf890dac60520ff24008cd1ebd83c amarokfs-0.4.2.ebuild 1479 -EBUILD amarokfs-0.5.ebuild 1473 RMD160 4cdb1758444aa1401d7a669876c622d7e5c38faf SHA1 52a1d62aadd54148a014cb70b4458435097191de SHA256 190b66a33521dbd8ad36417ad1877b98163dc30655c8bcd1b5d144a4e8b72bdc -MD5 ce408c528fd1514b233fd618cf7161bd amarokfs-0.5.ebuild 1473 -RMD160 4cdb1758444aa1401d7a669876c622d7e5c38faf amarokfs-0.5.ebuild 1473 -SHA256 190b66a33521dbd8ad36417ad1877b98163dc30655c8bcd1b5d144a4e8b72bdc amarokfs-0.5.ebuild 1473 -MISC ChangeLog 1085 RMD160 1bae2a7ee22b857363db9157b38f177687af4e1f SHA1 1b5ce622880cabc9f4657f7300f4b2f836d0b415 SHA256 715507a4d6ff5c3d20b1df2ea56fe5b68c9147dad8c5ad3adeb5235ac566dadf -MD5 1324e030763228430f72535c9e847938 ChangeLog 1085 -RMD160 1bae2a7ee22b857363db9157b38f177687af4e1f ChangeLog 1085 -SHA256 715507a4d6ff5c3d20b1df2ea56fe5b68c9147dad8c5ad3adeb5235ac566dadf ChangeLog 1085 +EBUILD amarokfs-0.5.ebuild 1531 RMD160 c09b585783057809b2c4c162a125234bec290616 SHA1 9628a97bbb646be647c66423157763b6f79bc3bf SHA256 38411c7db51f491c75cd72029d1515f4dc858fb514ed9776c4263faf8e817eae +MD5 e20af19d528dd6c4f034808615bf3be4 amarokfs-0.5.ebuild 1531 +RMD160 c09b585783057809b2c4c162a125234bec290616 amarokfs-0.5.ebuild 1531 +SHA256 38411c7db51f491c75cd72029d1515f4dc858fb514ed9776c4263faf8e817eae amarokfs-0.5.ebuild 1531 +MISC ChangeLog 1291 RMD160 285bf589043219917b9c169900a6a65293937351 SHA1 4f4eb79fdb7550407d906054e0b27f052f05603c SHA256 81accb4b78cd855e88c50945203bc7a844bcc34db63afc76df23983c6a8144f0 +MD5 3d6156fc7da0bdbfb65d8cc7c208a81b ChangeLog 1291 +RMD160 285bf589043219917b9c169900a6a65293937351 ChangeLog 1291 +SHA256 81accb4b78cd855e88c50945203bc7a844bcc34db63afc76df23983c6a8144f0 ChangeLog 1291 MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175 @@ -22,3 +29,10 @@ SHA256 9cbafa838a87aca023a3b0c81a689d6122e784ab89bbcb6765c5d6c8235b8a88 files/di MD5 fc4dc2cb0d2c0f421820dca0fc4c49ab files/digest-amarokfs-0.5 256 RMD160 87bb5a870c9b0e34531853d1dcfba4031d084c7b files/digest-amarokfs-0.5 256 SHA256 f5342da28218aeb47c0ab7a1de8416c64c133cb23c38efbcd71dc770b3413cb7 files/digest-amarokfs-0.5 256 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.4 (GNU/Linux) + +iD8DBQFGU2KACkvF58q80IkRArfKAKCoKlCH1c+jF9UVx7BM8LlXnldX3gCffUbT +ZQlE+CLGNpWWXJElEoqKcJs= +=Dx+n +-----END PGP SIGNATURE----- diff --git a/media-sound/amarokfs/amarokfs-0.5.ebuild b/media-sound/amarokfs/amarokfs-0.5.ebuild index ceba400c85f5..d2b29745d5f7 100644 --- a/media-sound/amarokfs/amarokfs-0.5.ebuild +++ b/media-sound/amarokfs/amarokfs-0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/amarokfs-0.5.ebuild,v 1.3 2007/04/28 15:36:04 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/amarokfs-0.5.ebuild,v 1.4 2007/05/22 21:36:58 philantrop Exp $ inherit qt3 kde-functions toolchain-funcs @@ -32,6 +32,8 @@ src_unpack() { sed -i -e "s:Icon=.*:Icon=${MY_PN}:" "${S}/${MY_PN}.desktop" || die "fix desktop file failed." sed -i -e 's:/usr/share/icons/:\0hicolor/128x128/apps/:' "${S}/${MY_PN}-xml.pro" || die "fix icon installation failed" sed -i -e '/qDebug/s:" + \(func\|query\):%s", \1.data():' "${S}"/*.cpp || die "fix for qDebug() calls failed." + + epatch ${FILESDIR}/${P}-FixMountPointIdQuery.patch } src_compile() { diff --git a/media-sound/amarokfs/files/amarokfs-0.5-FixMountPointIdQuery.patch b/media-sound/amarokfs/files/amarokfs-0.5-FixMountPointIdQuery.patch new file mode 100644 index 000000000000..ca53e3b23a3a --- /dev/null +++ b/media-sound/amarokfs/files/amarokfs-0.5-FixMountPointIdQuery.patch @@ -0,0 +1,18 @@ +Author: Buschmann <buschmann@huessenbergnetz.de> +Fixing an sql error when there is more than one device id for example because of more than one cover image in an album folder. + +--- amarokFS-0.5.orig/amfs-xml.cpp 2007-03-19 13:35:38.000000000 +0100 ++++ amarokFS-0.5/amfs-xml.cpp 2007-04-20 16:53:15.000000000 +0200 +@@ -656,7 +656,11 @@ QImage AmfsXML::getCoverPath(QString art + QString coverPathQuery = "select path from images where artist='" + artist + "' and album='" + album + "'"; + QStringList coverPath = getDCOPDataSQL(coverPathQuery); + +- QString deviceMountPointQuery = "select lastmountpoint from devices where id=(select deviceid from images where artist='" + artist + "' and album='" + album + "')"; ++ QString deviceMountPointIdQuery = "select deviceid from images where artist='" + artist + "' and album='" + album + "'"; ++ QStringList deviceMountPointId = getDCOPDataSQL(deviceMountPointIdQuery); ++ QString deviceMountPointFirstId = deviceMountPointId.first(); ++ ++ QString deviceMountPointQuery = "select lastmountpoint from devices where id='" + deviceMountPointFirstId + "'"; + QStringList deviceMountPoint = getDCOPDataSQL(deviceMountPointQuery); + + //path - location relative within the media library |