Fix gcc-4.5 compilation wrt bug #322725

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 03703d0716722ab12f343213eba7b3946770efbf..7c7221b61e30593cbd5c105f9fdd445a036b0148 100644 (file)
--- 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/Manifest b/app-office/kword/Manifest
index 8afd418e2b30829ad44c619c6a498339a57ad759..0cfce12de0e58a74124da0c968b5401e2662e522 100644 (file)
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,8 +1,9 @@
+AUX kword-2.1.2-gcc45.patch 784 RMD160 4e81507efb799c74a039fcf4991a264fa8e4a87b SHA1 1673f163054615ec374634eac46318c4463d83cc SHA256 d78850c29c4d6f34112c85a9bc6b21b29ddd5246adf7aee808a7a68c6ca818da
 DIST koffice-2.1.0.tar.bz2 76150485 RMD160 9703bdf4d70d0556c5c101f4cf4baecb17b66a10 SHA1 0fd0bf64e6d166d41bae41730b17d5194e7f5adf SHA256 96ea36d1e7e2495f0076805eacf29a84607dc597f58b129a310df7227716acc9
 DIST koffice-2.1.1.tar.bz2 50332433 RMD160 9c7123bf31370d406a6e5272d7e752c39b3596d5 SHA1 72a82cfaaca8fbdcd0ba4622f80d4cf27aff74d2 SHA256 ff928c2698ef37a5cc808faddf758ee0c44603ec19194c973f8e4d8fcc6aac01
 DIST koffice-2.1.2.tar.bz2 50359739 RMD160 20f3b162d49cbd70492c597aec2d79cb3de5a2d7 SHA1 29f5b5e611408ac2a2e68352cb64299b78d83094 SHA256 64233bb7b5b18813a9da46ab0c347170904611b59480b91297db4c3deb14b7da
 EBUILD kword-2.1.0.ebuild 713 RMD160 1f65f0e0c5abd23f981a4dbce24ea32387070b0f SHA1 94b3e1fda66e56a4069992863851e1e3d18e4c04 SHA256 aa594cec1a242629b75cbfdeb9a81215c9b9fcedf6bb9bededf9d16e1962babe
 EBUILD kword-2.1.1.ebuild 715 RMD160 dba1a679ed6ef6dd8bc5c5b132c9afa4e1e68fb2 SHA1 83776efa27c033b9eeec2739f7bfb44fa97f53aa SHA256 3ca925750e75d6dbb382842ed8b5dc34c2ccaca0fea2d359f9e4ff04270a1b6f
-EBUILD kword-2.1.2.ebuild 715 RMD160 e97ecee12d468c6975bbc989b910c8cd34a9fb4c SHA1 10d150f445e9ba82b751b40488b1724b50329bdf SHA256 84f7ab34c8ce2e76f80f7a44f8a59985ba8a86be0eb51d9dd49eb7518bf3e8ef
-MISC ChangeLog 17948 RMD160 105ed9261e8023782d893e6d1cb390ff7ccb1fcf SHA1 644b2cdd67b8257a1660f78fb49a820d61f4905c SHA256 5c7c32dbcb962d33af2f9d001a11fc6cdbb5e1f4e4d9d1bd4deb8abbf139bab8
+EBUILD kword-2.1.2.ebuild 758 RMD160 b3b9fd21f62cb1773097a4de7062786aa02aab21 SHA1 b33628f40d12e17be3fd30944feee99cde6cdc24 SHA256 77085853904d791a751665d4cbe2683d16ef25f75524dade35946e9653023ed8
+MISC ChangeLog 18097 RMD160 b5afa2ed283662952f8d7887f4a5ac3b575e7aa5 SHA1 27eb0894090b7e54c4e94edd849b47899bbd9718 SHA256 c39e37747c8658d2a5b5dc6df0448fa5dccca69d35a0ea9665429ae3a354e427
 MISC metadata.xml 283 RMD160 fbaac5a3e6372bbdfbd1c8e2f21667b24177083a SHA1 234fa1319e29712e6ac237921eeaae0a591d0602 SHA256 40523c9d7d6ebd6453db54f4912636eaa7b089efdeb7c4f2ee8cbf0abebeb57e

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 (file)
index 0000000..0fa5e34
--- /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 e7a28215124397ea44c1a0a9c7a2d18fdda48f12..bf88e60c098ffe3f7055c23e6ba3696120a28f43 100644 (file)
--- 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}