diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-06-23 18:05:39 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-06-23 18:05:39 +0000 |
| commit | 05a656690c32ab35411ecf87cc249ded3a4a84a8 (patch) | |
| tree | da3ab620132d49790254c6b127e1c7240d04257c | |
| parent | <http://my.opera.com/desktopteam/blog/2010/06/23/stability-work>. (diff) | |
| download | gentoo-2-05a656690c32ab35411ecf87cc249ded3a4a84a8.tar.gz gentoo-2-05a656690c32ab35411ecf87cc249ded3a4a84a8.tar.bz2 gentoo-2-05a656690c32ab35411ecf87cc249ded3a4a84a8.zip | |
Fix gcc-4.5 compilation wrt bug #322725
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | app-office/kword/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/kword/files/kword-2.1.2-gcc45.patch | 13 | ||||
| -rw-r--r-- | app-office/kword/kword-2.1.2.ebuild | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog index 03703d071672..7c7221b61e30 100644 --- a/app-office/kword/ChangeLog +++ b/app-office/kword/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/kword # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.146 2010/03/31 21:53:38 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.147 2010/06/23 18:05:39 hwoarang Exp $ + + 23 Jun 2010; Markos Chandras <hwoarang@gentoo.org> kword-2.1.2.ebuild, + +files/kword-2.1.2-gcc45.patch: + Fix gcc-4.5 compilation wrt bug #322725 *kword-2.1.2 (31 Mar 2010) diff --git a/app-office/kword/files/kword-2.1.2-gcc45.patch b/app-office/kword/files/kword-2.1.2-gcc45.patch new file mode 100644 index 000000000000..0fa5e34e840e --- /dev/null +++ b/app-office/kword/files/kword-2.1.2-gcc45.patch @@ -0,0 +1,13 @@ +Index: kword-2.1.2/filters/kword/msword-odf/texthandler.cpp +=================================================================== +--- kword-2.1.2.orig/filters/kword/msword-odf/texthandler.cpp ++++ kword-2.1.2/filters/kword/msword-odf/texthandler.cpp +@@ -863,7 +863,7 @@ bool KWordTextHandler::writeListInfo(KoX + unsigned int code = text[0].unicode(); + if ( (code & 0xFF00) == 0xF000 ) // see wv2 + code &= 0x00FF; +- listStyleWriter.addAttribute( "text:bullet-char", QString::QString( code ).toUtf8() ); ++ listStyleWriter.addAttribute( "text:bullet-char", QString( code ).toUtf8() ); + } + else + kWarning(30513) << "Bullet with more than one character, not supported"; diff --git a/app-office/kword/kword-2.1.2.ebuild b/app-office/kword/kword-2.1.2.ebuild index e7a282151243..bf88e60c098f 100644 --- a/app-office/kword/kword-2.1.2.ebuild +++ b/app-office/kword/kword-2.1.2.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/app-office/kword/kword-2.1.2.ebuild,v 1.2 2010/06/21 13:57:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.1.2.ebuild,v 1.3 2010/06/23 18:05:39 hwoarang Exp $ EAPI="2" @@ -29,6 +29,9 @@ KMEXTRACTONLY=" " KMLOADLIBS="koffice-libs" +PATCHES=( + "${FILESDIR}"/${P}-gcc45.patch +) src_configure() { mycmakeargs="${mycmakeargs} |