From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Sat, 11 Mar 2006 20:29:20 +0000 (+0000)
Subject: Add patch to build with GCC 4.1.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d29ef2cdf914f9ee8542248c7ea490a71911d64;p=gentoo.git

Add patch to build with GCC 4.1.
Package-Manager: portage-2.1_pre5-r4
---

diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 83139e4e8d31..dd599b4b8554 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kspread
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.33 2006/03/11 15:51:01 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.34 2006/03/11 20:29:20 flameeyes Exp $
+
+  11 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kspread-1.5_beta2-gcc41.patch, kspread-1.5_beta2.ebuild:
+  Add patch to build with GCC 4.1.
 
 *kspread-1.5_beta2 (11 Mar 2006)
 
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index e4ed8098f2d0..7a85a82bdeda 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,11 +1,46 @@
-MD5 17041ca98e20a91893ff3565570bb1cc ChangeLog 3866
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74ac8362eb277eaa900053ddb52d701c ChangeLog 4025
+RMD160 a5b62a96a72157860af382ac2467b8dad28c0b38 ChangeLog 4025
+SHA256 1ae08d51054f9472dbc577ff09891bdb7c3e681130c93307818c91e3505f6d45 ChangeLog 4025
 MD5 902823ac54984271d00a3e72454440b1 files/digest-kspread-1.4.2 250
+RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kspread-1.4.2 250
+SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kspread-1.4.2 250
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kspread-1.4.2-r1 68
+RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-kspread-1.4.2-r1 68
+SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-kspread-1.4.2-r1 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kspread-1.5_beta1 253
+RMD160 0e78237b9b17a1c13e8f3a1031875bddec8bafdb files/digest-kspread-1.5_beta1 253
+SHA256 43ee5c0ab325495515723afb3fc2e4bc79eba3f6987fbc2dad504492e5a6e076 files/digest-kspread-1.5_beta1 253
 MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kspread-1.5_beta2 69
+RMD160 2a7080ad773e7a7dd0db34f5523a21240af939ee files/digest-kspread-1.5_beta2 69
+SHA256 50df51ad875d7ac8e423e0fbb5f1185aafeb523ba6d47aa5a74c7088290335b6 files/digest-kspread-1.5_beta2 69
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
+RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451
+SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a files/kspread-1.4.2-gcc41.patch 451
+MD5 db18e4e5bfc2a5ed58891f4b14598b27 files/kspread-1.5_beta2-gcc41.patch 615
+RMD160 26f7cfdf56dea63cb3fd1847ea080dd2ee83e1bf files/kspread-1.5_beta2-gcc41.patch 615
+SHA256 866b92a617bbf6883b396e1d652974f6b5f268eebb5620e244775b03fa7521bf files/kspread-1.5_beta2-gcc41.patch 615
 MD5 3d2a2ae8f85c854c5d0968e926d78f89 kspread-1.4.2-r1.ebuild 1220
+RMD160 ab0594f5b1ed73c43458ad706991bdb49825f44d kspread-1.4.2-r1.ebuild 1220
+SHA256 b6e1c30323c7c0976c3ed7820d23ce839f23c3ed8ffb6dee31c307944a8c5019 kspread-1.4.2-r1.ebuild 1220
 MD5 c25f4c8ea619ddbe186c5c06f03fd2dd kspread-1.4.2.ebuild 1164
+RMD160 ac964788c46b9b2ef67003ba59b22b4082c464a5 kspread-1.4.2.ebuild 1164
+SHA256 edb6f7a7b7744516e776d12e1b40e6ebdf5a0c5aec1eebbd8fa5ef6fbfc31314 kspread-1.4.2.ebuild 1164
 MD5 a64c3b86bebf367a73cad56f9d69165d kspread-1.5_beta1.ebuild 1128
-MD5 ed1675452f6f6360ec0e53228635d180 kspread-1.5_beta2.ebuild 1128
+RMD160 2845fd8b742b0aa20043f248cefb4863e040a05e kspread-1.5_beta1.ebuild 1128
+SHA256 b5b362bb71f6639ec7b81b5fdc92e7537a507fe81d2fee6d89002415dc3ab118 kspread-1.5_beta1.ebuild 1128
+MD5 b58d635ff35104ffc9e45c0bff8508ca kspread-1.5_beta2.ebuild 1172
+RMD160 23fa98f641e31526d3c26e78dbcbc2e2130bcd29 kspread-1.5_beta2.ebuild 1172
+SHA256 30019cf2bdbac68679f8d98b34e42b06af00a1b338b0ec15d0377bbd79b12409 kspread-1.5_beta2.ebuild 1172
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
+SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEEzLkAiZjviIA2XgRAjoAAJ4wbItDtrKf86lvyqS7LSoTyOL2IgCfbcPg
++rzekYotvmyPN10egyuwVPo=
+=1ns6
+-----END PGP SIGNATURE-----
diff --git a/app-office/kspread/files/kspread-1.5_beta2-gcc41.patch b/app-office/kspread/files/kspread-1.5_beta2-gcc41.patch
new file mode 100644
index 000000000000..25bb9849bbfe
--- /dev/null
+++ b/app-office/kspread/files/kspread-1.5_beta2-gcc41.patch
@@ -0,0 +1,13 @@
+Index: kspread-1.5_beta2/kspread/valueparser.h
+===================================================================
+--- kspread-1.5_beta2.orig/kspread/valueparser.h
++++ kspread-1.5_beta2/kspread/valueparser.h
+@@ -70,7 +70,7 @@ class ValueParser {
+       bool & duration);
+ 
+   /** a helper function to read numbers and distinguish integers and FPs */
+-  double ValueParser::readNumber(const QString &_str, bool * ok, bool * isInt);
++  double readNumber(const QString &_str, bool * ok, bool * isInt);
+   /** a helper function to read integers */
+   int readInt (const QString &str, uint &pos);
+   FormatType fmtType;
diff --git a/app-office/kspread/kspread-1.5_beta2.ebuild b/app-office/kspread/kspread-1.5_beta2.ebuild
index 927eaf079717..b9957e75b84f 100644
--- a/app-office/kspread/kspread-1.5_beta2.ebuild
+++ b/app-office/kspread/kspread-1.5_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.5_beta2.ebuild,v 1.1 2006/03/11 15:51:01 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.5_beta2.ebuild,v 1.2 2006/03/11 20:29:20 flameeyes Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -40,6 +40,8 @@ KMEXTRA="filters/kspread"
 
 need-kde 3.4
 
+PATCHES="${FILESDIR}/${P}-gcc41.patch"
+
 src_unpack() {
 	kde-meta_src_unpack unpack