diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-24 18:44:28 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-24 18:44:28 +0000 |
| commit | 6246604d2ee51259f0d8c903ec7d93bdc41b5f6f (patch) | |
| tree | 1d3ae3dfb42363eaa4e46842c990c7619c078418 /media-video/subtitlecomposer | |
| parent | Version bumped. (diff) | |
| download | historical-6246604d2ee51259f0d8c903ec7d93bdc41b5f6f.tar.gz historical-6246604d2ee51259f0d8c903ec7d93bdc41b5f6f.tar.bz2 historical-6246604d2ee51259f0d8c903ec7d93bdc41b5f6f.zip | |
Fix build with GCC-4.5 wrt bug 323055. Thanks to Diego for reporting.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'media-video/subtitlecomposer')
4 files changed, 37 insertions, 4 deletions
diff --git a/media-video/subtitlecomposer/ChangeLog b/media-video/subtitlecomposer/ChangeLog index 7b5594fae4f8..dda07d1e6540 100644 --- a/media-video/subtitlecomposer/ChangeLog +++ b/media-video/subtitlecomposer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/subtitlecomposer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/ChangeLog,v 1.4 2010/06/08 03:16:40 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/ChangeLog,v 1.5 2010/06/24 18:44:27 xarthisius Exp $ + + 24 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> + subtitlecomposer-0.5.3.ebuild, +files/subtitlecomposer-0.5.3-gcc45.patch: + Fix build with GCC-4.5 wrt bug 323055. Thanks to Diego for reporting. 08 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> subtitlecomposer-0.5.3.ebuild: diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest index b73cb5fdeba6..36acd2e39714 100644 --- a/media-video/subtitlecomposer/Manifest +++ b/media-video/subtitlecomposer/Manifest @@ -1,5 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX subtitlecomposer-0.5.3-gcc45.patch 317 RMD160 30c718d3d0231bd6550cfd9e8a5b59361248575e SHA1 df30cbe5008f51d643c45fad9729b2db6128ca18 SHA256 4ca2428c9e806134cb36f029fa7314a4d1e7c33dc3c35b3957bd9688a9945161 AUX subtitlecomposer-linkage-patch.patch 388 RMD160 389c87876662077c611663734f64c21422bba748 SHA1 121be84dc4ddb8ca81545ce9b0c297f496e57f69 SHA256 8f642a81bbfe12ffbf25ae696be3377e595049a81afc4214d9647a3c95d7dea4 DIST subtitlecomposer-0.5.3.tar.bz2 344295 RMD160 e90c72005c73f8c90d437a0ad6e8f4487d1638ff SHA1 8b4bcba870c79af6cba35a2af5e4d740c3238afc SHA256 87f3831b5ae09f4ffcefe586cd3b04b197784bf09652b02518b24a12fde2cad0 -EBUILD subtitlecomposer-0.5.3.ebuild 1275 RMD160 5be11c10745484e85d182bc5a8cf0eb3b505ea6b SHA1 bdf9ebdf9cdca65a90b36dce02eb82d220b4329c SHA256 a2c8a59e25edf50183f8d6b9927be0194075885422081fe22947468c712f4e95 -MISC ChangeLog 1111 RMD160 23fe01eb30e9fa9f8365f6d1f5d22e4d281727f0 SHA1 ab60dbe24c4af1dadcffecc813dea3d374ab4f78 SHA256 0e8e6afe8be42441f6e66766d4345a24b6e60f298a2d1826b28b297eb8d54e71 +EBUILD subtitlecomposer-0.5.3.ebuild 1316 RMD160 5c2e2ee72e245d05613ebb938332fc8f4c295bfc SHA1 84bbc4ca3ef6399bfa928291b52f07f5a756d4d7 SHA256 9a8048b4d8791a34956d5f854e81767aac6e2285b7137c3afc254cd2108fc593 +MISC ChangeLog 1316 RMD160 4b61904ce5f4a642b9a41197308ded46e49efb08 SHA1 58bc392a269f7a6629c79dbfa156e4db09881787 SHA256 c9dfa305124021534bdcc107461f0ff1e0bb9653df5e3fb373a224510e3c4dea MISC metadata.xml 160 RMD160 a42d246e41349d4ad54c940dc210bac8b370e244 SHA1 91227a2bf9ff71606a0b47b3d05625fe2ffeecec SHA256 02d7eda2306ce32c363268db611d0ef0fc15356e1353a3be273de0d5c034cfff +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iJwEAQECAAYFAkwjp5cACgkQIiMqcbOVdxSx5wP/Za/oTCXCwqU8buL6nCj/zBxa +R0YUCdlNozx084J/cugDJU9HxY7wmRHtFmY2L9K38R9LjhLT0ju8FyBMvEgmtCz5 +XTVNn5AXySSyFGShAnmRVUGoR2b9wVtvsgA6qHZBSoucFW3fNvbNH++FIeDF4klO +mWh3jcV6FRIHM5kwOsQ= +=Pc7N +-----END PGP SIGNATURE----- diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gcc45.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gcc45.patch new file mode 100644 index 000000000000..4439071173b1 --- /dev/null +++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gcc45.patch @@ -0,0 +1,15 @@ +Fix build with GCC-4.5 + +http://bugs.gentoo.org/show_bug.cgi?id=323055 + +--- src/core/sstring.cpp ++++ src/core/sstring.cpp +@@ -1112,7 +1112,7 @@ + append( str ); + } + +-SStringList::SStringList( const SStringList::SStringList& list ): ++SStringList::SStringList( const SStringList& list ): + QList<SString>( list ) + { + } diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.3.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.5.3.ebuild index 7a9f0c1ba1ff..c55ed1cb4ec6 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-0.5.3.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-0.5.3.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-video/subtitlecomposer/subtitlecomposer-0.5.3.ebuild,v 1.2 2010/06/08 03:16:40 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/subtitlecomposer-0.5.3.ebuild,v 1.3 2010/06/24 18:44:27 xarthisius Exp $ EAPI="2" @@ -30,6 +30,7 @@ src_prepare() { # linkage issue epatch "${FILESDIR}/${PN}-linkage-patch.patch" + epatch "${FILESDIR}"/${P}-gcc45.patch sed -e '/ADD_SUBDIRECTORY( api )/s/^/# DISABLED/' \ -i src/main/scripting/examples/CMakeLists.txt \ |