summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-11 20:29:20 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-11 20:29:20 +0000
commit97ad450eba2a577cb44e7e292a7a832ac1e674af (patch)
tree96183e8149b1709b47f301e1b40793069c1b6d99 /app-office/kspread
parentFiltered hashval LDFLAG since it breaks the configure script. This fixes bug#... (diff)
downloadgentoo-2-97ad450eba2a577cb44e7e292a7a832ac1e674af.tar.gz
gentoo-2-97ad450eba2a577cb44e7e292a7a832ac1e674af.tar.bz2
gentoo-2-97ad450eba2a577cb44e7e292a7a832ac1e674af.zip
Add patch to build with GCC 4.1.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'app-office/kspread')
-rw-r--r--app-office/kspread/ChangeLog6
-rw-r--r--app-office/kspread/files/kspread-1.5_beta2-gcc41.patch13
-rw-r--r--app-office/kspread/kspread-1.5_beta2.ebuild4
3 files changed, 21 insertions, 2 deletions
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/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