diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2012-09-16 19:00:59 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2012-09-16 19:00:59 +0000 |
| commit | 060e5b26eaf22c2b44d190edf2ec93f3c73d44d8 (patch) | |
| tree | a231843d12b13569f0746aab9c826b3f2082e8a0 /app-text | |
| parent | Mark as DEAD for removal. (diff) | |
| download | historical-060e5b26eaf22c2b44d190edf2ec93f3c73d44d8.tar.gz historical-060e5b26eaf22c2b44d190edf2ec93f3c73d44d8.tar.bz2 historical-060e5b26eaf22c2b44d190edf2ec93f3c73d44d8.zip | |
Fix build with GCC 4.7 (bug #419505).
Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/sword/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/sword/Manifest | 15 | ||||
| -rw-r--r-- | app-text/sword/files/sword-1.6.2-gcc47.patch | 35 | ||||
| -rw-r--r-- | app-text/sword/sword-1.6.2.ebuild | 6 |
4 files changed, 57 insertions, 5 deletions
diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog index 0c61473a5c6b..346ebfe50f35 100644 --- a/app-text/sword/ChangeLog +++ b/app-text/sword/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/sword # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.67 2012/05/04 03:33:16 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.68 2012/09/16 19:00:59 dirtyepic Exp $ + + 17 Sep 2012; Ryan Hill <dirtyepic@gentoo.org> sword-1.6.2.ebuild, + +files/sword-1.6.2-gcc47.patch: + Fix build with GCC 4.7 (bug #419505). 04 May 2012; Jeff Horelick <jdhore@gentoo.org> sword-1.6.2.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest index 1a028d9e8f61..caf1034598bf 100644 --- a/app-text/sword/Manifest +++ b/app-text/sword/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX sword-1.6.2-gcc47.patch 1251 SHA256 3139272398bb95733b14af83dbe1a23dc895df484a073e901073adbe8ccf8b8e SHA512 2c131c963bbf4d181ee31ae5a6a28c0ea93daf3ad42f5a6dd3841edbb328011d2082c550a0311092eee08da9e5aa5692fdb1d02b3d3fb2cb186ee042dd021a71 WHIRLPOOL 616d54a3fc49fa29bd182acab3742850cd91e83c9b59c4153a6313e2d5ac7a0e808065849f0f8c4a1a716b1edd1b3f020d4cd5303bbf8e5fdedaeca97611b3c2 DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d -EBUILD sword-1.6.2.ebuild 1804 SHA256 43ad2a42b595ea1c4df836fb532e1d5898c87c22489aa42e1373b43809deccc8 SHA512 e9eea32454420b09218e5e1070f222270cd24d5737aa9930ab85f19e3ec6192556ce4344204a383f57d9ecefcb98fc6a29b8e585905c434c037067f6a1f8f940 WHIRLPOOL 1f96e38158a90f906014795e613c33d1adc382d06a81e7cac58f7f2c93ef947192489943e295053221d10d17e3529a0f274146ad083c6460654463724cc5e55a -MISC ChangeLog 9161 SHA256 d8fcefeeceaf6e1aa29e1f5b0e4c98cacc9893c81bafbcf65d7665a6e150ae5b SHA512 9605284251ab2cbd6ac186e9d24872eb410eba95e6536be99c8875527621439d0267aaf813d68960532290e4663c538f43041818e6faf087e783b960ed7da263 WHIRLPOOL bef91e6953f40a8fc174a011c5b758eb1a31468b59d988f0586db9e16c3d0d91b994616c1de12fa16ae4cd300e7606e87ee784ad14b2e748b7aa5ce2d50ef083 +EBUILD sword-1.6.2.ebuild 1854 SHA256 ec62e9d43c5ae42b650bf07c0338e5a16557d384b89b4aa565ec1a0c8a1c7d6f SHA512 2618203b3df0a45797362302423e961be8075ff1d7ef2ca24d466a2d88855f3cc293c407aab31b1077b51f28b2acd8b188288470b6dd2e07d393fa953027535e WHIRLPOOL 8a4a1be32f6770507b1dc07e77d5fd1cb77be68f364b7015693297ad6e1f4db1817760521e756248088c45585dfaee105e11435db7fe968b1a4b3f9c07b22c34 +MISC ChangeLog 9307 SHA256 36af3ddd6f49985e2a57b281872cc157c36cea2a764e87192337acd0d3a17141 SHA512 16dac69d741a2d38bfa4e4f0523bfa2bbd8cac7189c092a0ca0b5eecc458edabfd243318a04767b9a6c764ba8261c11f015aed672857af49e243a85563095f91 WHIRLPOOL edd923c95eed87e041ca557c96fc88abe7f335ea629a94130fcf34ad4cffc7ec1cdc79ff293864859c9ffe2f8fbc327b3afadd5d20b0ef211a44e138cefadcd5 MISC metadata.xml 469 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789 SHA512 73c8f05759ff7ca4a6a275d7fbab7d0c120764a3cbfec4829fc1137438cdd8b38ba607b23efdd10de35c547cd938e8dc14b1551110957f9d4dc0e7bc822266cc WHIRLPOOL 3eac7eb0f3087a133b7fad4eae01bd0a5b4413cb60d56bbeac9b2207a9eeaab01ddae231a06ed5e02c33563813dc05d9e1d43e933f524c7efd45dccc9a917a48 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEYEAREIAAYFAlBXIYoACgkQiqiDRvmkBmKccwCeKVvR8dRqJWtuZaADxgflfGo8 +agMAoJ8HQVRLYCQxTht93/3AuPzABImO +=Tm7s +-----END PGP SIGNATURE----- diff --git a/app-text/sword/files/sword-1.6.2-gcc47.patch b/app-text/sword/files/sword-1.6.2-gcc47.patch new file mode 100644 index 000000000000..7b55de75b646 --- /dev/null +++ b/app-text/sword/files/sword-1.6.2-gcc47.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/419505 + + +--- a/include/multimapwdef.h ++++ b/include/multimapwdef.h +@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap<Key, T, Compare> { + public: + typedef std::pair<const Key, T> value_type; + T& getWithDefault(const Key& k, const T& defaultValue) { +- if (find(k) == this->end()) { +- insert(value_type(k, defaultValue)); ++ if (this->find(k) == this->end()) { ++ this->insert(value_type(k, defaultValue)); + } +- return (*(find(k))).second; ++ return (*(this->find(k))).second; + } + + T& operator[](const Key& k) { +- if (find(k) == this->end()) { +- insert(value_type(k, T())); ++ if (this->find(k) == this->end()) { ++ this->insert(value_type(k, T())); + } +- return (*(find(k))).second; ++ return (*(this->find(k))).second; + } + bool has(const Key& k, const T &val) const { +- typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k); +- typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k); ++ typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k); ++ typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k); + for (; start!=end; start++) { + if (start->second == val) + return true; diff --git a/app-text/sword/sword-1.6.2.ebuild b/app-text/sword/sword-1.6.2.ebuild index 3a8bbbbc2e61..eeada2e1f5bd 100644 --- a/app-text/sword/sword-1.6.2.ebuild +++ b/app-text/sword/sword-1.6.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.2.ebuild,v 1.7 2012/05/04 03:33:16 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.2.ebuild,v 1.8 2012/09/16 19:00:59 dirtyepic Exp $ EAPI=4 -inherit flag-o-matic +inherit eutils flag-o-matic DESCRIPTION="Library for Bible reading software." HOMEPAGE="http://www.crosswire.org/sword/" @@ -35,6 +35,8 @@ src_prepare() { [Install] DataPath=${EPREFIX}/usr/share/${PN}/ EOF + + epatch "${FILESDIR}"/${P}-gcc47.patch } src_configure() { |