summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-06-22 18:19:45 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-06-22 18:19:45 +0000
commit26f5d07e3330a59ba6d740788be626f9c546d62f (patch)
tree901823abaa0b19a822ec776b7d1a3e1e6d24a5e5 /media-sound/audex
parentdev-util/subversion renamed to dev-vcs/subversion. (diff)
downloadhistorical-26f5d07e3330a59ba6d740788be626f9c546d62f.tar.gz
historical-26f5d07e3330a59ba6d740788be626f9c546d62f.tar.bz2
historical-26f5d07e3330a59ba6d740788be626f9c546d62f.zip
Fix gcc-4.5 build failures wrt bug #323547
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-sound/audex')
-rw-r--r--media-sound/audex/ChangeLog6
-rw-r--r--media-sound/audex/Manifest5
-rw-r--r--media-sound/audex/audex-0.72_beta1.ebuild7
-rw-r--r--media-sound/audex/files/audex-0.72_beta1-gcc45.patch13
4 files changed, 26 insertions, 5 deletions
diff --git a/media-sound/audex/ChangeLog b/media-sound/audex/ChangeLog
index af29e41981ae..511f36dfd947 100644
--- a/media-sound/audex/ChangeLog
+++ b/media-sound/audex/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/audex
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.9 2010/06/20 19:14:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.10 2010/06/22 18:19:45 hwoarang Exp $
+
+ 22 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+ audex-0.72_beta1.ebuild, +files/audex-0.72_beta1-gcc45.patch:
+ Fix gcc-4.5 build failures wrt bug #323547
20 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
audex-0.72_beta1.ebuild, +files/audex-0.72_beta1-MkdirJob.patch:
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index f2c008123fdc..39175c3a2ddc 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,5 +1,6 @@
AUX audex-0.72_beta1-MkdirJob.patch 245 RMD160 5be4bc469936fd40aafa1ae268858ddfb18dfd9f SHA1 dc18f7bb3176ba99ca33098e59d22cafc29a8978 SHA256 5a6809ca4706a9bd6ca510bdeba270156dd8e66133283d93ec4c97453978c330
+AUX audex-0.72_beta1-gcc45.patch 380 RMD160 c808337f4d58d8f568b2f7ee871250d457131989 SHA1 d8817e9613074f10963f2d68345855aba5d1743b SHA256 59efc4f12f2c0a6ad5029ff8cec8c9f9271e1260baabe9195d881c9cd964261e
DIST audex-0.72b1.tar.bz2 207987 RMD160 a79f50fa3687c2386fbf100bc75637948f6b7d48 SHA1 f91d58887aba9e4441d3e53db0fbc1ebc4f40573 SHA256 87a31cc95b7b1b587c6f091d8248b76128d249de7d758ae621c8376597ccd757
-EBUILD audex-0.72_beta1.ebuild 725 RMD160 cef5e6bd83e82a3b734d9173ae3ec43e7323a66c SHA1 4d8baf0504954c9bd6e4e38ec5b726a95341be24 SHA256 66f786e891031ebb2edd8b8ec69d1610d4d14e50d58e4544c7b9dc513112c689
-MISC ChangeLog 1750 RMD160 9ff0b32fe0318074b964634f736a71ac933c963f SHA1 6addd3b58486ee84892b5a5c069db37bbb95445c SHA256 6c9b064462652251e7647c8eebcd16e83c8745efe1cb6e26dae7360c42382aac
+EBUILD audex-0.72_beta1.ebuild 757 RMD160 92cc8488c52d6d9d305456f9f52e191c9dc89456 SHA1 be134c94e7a143861e9b75aabe639fc1e9df266b SHA256 30387a82ca8dc6ef8de1b0fc9a728cce257029bbbc2416108bcd3ec9c032400a
+MISC ChangeLog 1913 RMD160 9495defe3f616e14d6e15c0d69703311a7fff30c SHA1 5fc1575b8acb8268b65710be4d4feceff0a682e4 SHA256 85ae486de8e85200aa9bc65520542bb4f83ee16f0274caf504f0c66ca3e44eca
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/audex/audex-0.72_beta1.ebuild b/media-sound/audex/audex-0.72_beta1.ebuild
index c95a5eff4a19..068ec00c8c67 100644
--- a/media-sound/audex/audex-0.72_beta1.ebuild
+++ b/media-sound/audex/audex-0.72_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/audex-0.72_beta1.ebuild,v 1.3 2010/06/20 19:14:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/audex-0.72_beta1.ebuild,v 1.4 2010/06/22 18:19:45 hwoarang Exp $
EAPI="2"
@@ -24,4 +24,7 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/${P}-MkdirJob.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-MkdirJob.patch"
+ "${FILESDIR}/${P}-gcc45.patch"
+)
diff --git a/media-sound/audex/files/audex-0.72_beta1-gcc45.patch b/media-sound/audex/files/audex-0.72_beta1-gcc45.patch
new file mode 100644
index 000000000000..7b2c7fb55ae5
--- /dev/null
+++ b/media-sound/audex/files/audex-0.72_beta1-gcc45.patch
@@ -0,0 +1,13 @@
+Index: audex/models/cddamodel.h
+===================================================================
+--- audex.orig/models/cddamodel.h
++++ audex/models/cddamodel.h
+@@ -240,7 +240,7 @@ private slots:
+
+ private:
+ QString _device;
+- KCompactDisc::KCompactDisc *compact_disc;
++ KCompactDisc *compact_disc;
+ KCDDB::Client *cddb;
+ KCDDB::CDInfo cd_info;
+ CachedImage *_cover;