diff options
| author |   Jon Hood <squinky86@gentoo.org> | 2004-05-02 02:44:35 +0000 |
|---|---|---|
| committer | Jon Hood <squinky86@gentoo.org> | 2004-05-02 02:44:35 +0000 |
| commit | 3e7b1d7c9de1064c90e07693053a72f19b5369e8 (patch) | |
| tree | 32d4a98c27ea74a252bc709937631c3aadecdd9b /app-text/sword | |
| parent | Added gcc-3.0 notice to pkg_postinstall() (diff) | |
| download | historical-3e7b1d7c9de1064c90e07693053a72f19b5369e8.tar.gz historical-3e7b1d7c9de1064c90e07693053a72f19b5369e8.tar.bz2 historical-3e7b1d7c9de1064c90e07693053a72f19b5369e8.zip | |
gcc-3.4 compile-time fix from Robert Moss irt #48523
Diffstat (limited to 'app-text/sword')
| -rw-r--r-- | app-text/sword/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/sword/Manifest | 5 | ||||
| -rw-r--r-- | app-text/sword/files/sword-gcc34-gentoo.patch | 19 | ||||
| -rw-r--r-- | app-text/sword/sword-1.5.7.ebuild | 3 |
4 files changed, 29 insertions, 5 deletions
diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog index a4453ae6ba19..a80fac57bcf5 100644 --- a/app-text/sword/ChangeLog +++ b/app-text/sword/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for app-text/sword -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.12 2004/04/08 22:11:14 squinky86 Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.13 2004/05/02 02:44:35 squinky86 Exp $ + 01 May 2004; Jon Hood <squinky86@gentoo.org> + +files/sword-gcc34-gentoo.patch, sword-1.5.7.ebuild: + gcc3.4 compile time patch from Robert Moss <robert.moss@jesus.ox.ac.uk> *sword-1.5.7 (05 Apr 2004) diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest index c2c0de65260f..8af56dcaf32c 100644 --- a/app-text/sword/Manifest +++ b/app-text/sword/Manifest @@ -1,8 +1,9 @@ -MD5 03ad30a89e5d058f34667408da54cd31 sword-1.5.7.ebuild 1442 +MD5 d05103dd7bda5e837196ffc2b2ea4e09 sword-1.5.7.ebuild 1487 MD5 22b65f67eb846725f6981d977ea20ce0 sword-1.5.6.ebuild 1186 -MD5 3fc48b882c30a8dbbf671850a85d5f13 ChangeLog 1533 +MD5 fcdb8edb9a0d849a9c1c85b0bda739b9 ChangeLog 1709 MD5 e279ffe17a23a81dce3748c0a3ef0f3f metadata.xml 468 MD5 9e04e627c30e6862e7cae8a2e5b9af22 files/digest-sword-1.5.6 64 MD5 804c86a778da7cd957c88cf4640abfae files/digest-sword-1.5.7 64 MD5 eebb7c4602450ff87a76e5a693e72da7 files/sword.conf 37 +MD5 700763bf948395ef766f5ec4b78c7b05 files/sword-gcc34-gentoo.patch 567 MD5 8da3224ff457b08e298c9aabe83920b9 files/sword-installmgr-gentoo.patch 472 diff --git a/app-text/sword/files/sword-gcc34-gentoo.patch b/app-text/sword/files/sword-gcc34-gentoo.patch new file mode 100644 index 000000000000..bf0869f9cb20 --- /dev/null +++ b/app-text/sword/files/sword-gcc34-gentoo.patch @@ -0,0 +1,19 @@ +--- include/multimapwdef.h.old 2004-04-29 04:22:07.516715976 +0100 ++++ include/multimapwdef.h 2004-04-29 04:22:20.051810352 +0100 +@@ -12,14 +12,14 @@ + public: + typedef std::pair<const Key, T> value_type; + T& getWithDefault(const Key& k, const T& defaultValue) { +- if (find(k) == end()) { ++ if (find(k) == this->end()) { + insert(value_type(k, defaultValue)); + } + return (*(find(k))).second; + } + + T& operator[](const Key& k) { +- if (find(k) == end()) { ++ if (find(k) == this->end()) { + insert(value_type(k, T())); + } + return (*(find(k))).second; diff --git a/app-text/sword/sword-1.5.7.ebuild b/app-text/sword/sword-1.5.7.ebuild index 2994c8907ab3..10f057c6aeed 100644 --- a/app-text/sword/sword-1.5.7.ebuild +++ b/app-text/sword/sword-1.5.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.7.ebuild,v 1.4 2004/04/08 22:11:14 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.7.ebuild,v 1.5 2004/05/02 02:44:35 squinky86 Exp $ inherit eutils @@ -22,6 +22,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/${PN}-installmgr-gentoo.patch + epatch ${FILESDIR}/${PN}-gcc34-gentoo.patch } src_compile() { |