summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/kformula/ChangeLog6
-rw-r--r--app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch126
-rw-r--r--app-office/kformula/kformula-1.6.2.ebuild46
3 files changed, 5 insertions, 173 deletions
diff --git a/app-office/kformula/ChangeLog b/app-office/kformula/ChangeLog
index 42088c84e2a5..66ac1dfc861b 100644
--- a/app-office/kformula/ChangeLog
+++ b/app-office/kformula/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/kformula
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.91 2009/09/27 12:31:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.92 2009/11/01 09:22:02 abcd Exp $
+
+ 01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kformula-1.6.2.ebuild,
+ -files/kformula-1.6.2-gcc-4.3.patch:
+ Drop old version
27 Sep 2009; Brent Baude <ranger@gentoo.org>
kformula-1.6.3_p20090204.ebuild:
diff --git a/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch b/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch
deleted file mode 100644
index 1f9ce05bc9c4..000000000000
--- a/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- branches/koffice/1.6/koffice/lib/kformula/textelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/textelement.h 2007/05/28 18:26:19 669186
-@@ -75,7 +75,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
-@@ -246,7 +246,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/symbolelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/symbolelement.h 2007/05/28 18:26:19 669186
-@@ -67,7 +67,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/spaceelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/spaceelement.h 2007/05/28 18:26:19 669186
-@@ -80,7 +80,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h 2007/05/28 18:26:19 669186
-@@ -94,7 +94,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/rootelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/rootelement.h 2007/05/28 18:26:19 669186
-@@ -68,7 +68,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
-@@ -79,7 +79,7 @@
- * We can use our parentPosition to get our own origin then.
- */
- virtual void draw( QPainter& painter, const LuPixelRect& r,
-- const ContextStyle& style,
-+ const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style,
---- branches/koffice/1.6/koffice/lib/kformula/paddedelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/paddedelement.h 2007/05/28 18:26:19 669186
-@@ -34,7 +34,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/matrixelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/matrixelement.h 2007/05/28 18:26:19 669186
-@@ -82,7 +82,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
-@@ -377,7 +377,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/indexelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/indexelement.h 2007/05/28 18:26:19 669186
-@@ -79,7 +79,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/glyphelement.h 2007/05/28 18:20:51 669185
-+++ branches/koffice/1.6/koffice/lib/kformula/glyphelement.h 2007/05/28 18:26:19 669186
-@@ -33,7 +33,7 @@
- * Calculates our width and height and
- * our children's parentPosition.
- */
-- virtual void calcSizes( const ContextStyle& style,
-+ virtual void calcSizes( const ContextStyle& cstyle,
- ContextStyle::TextStyle tstyle,
- ContextStyle::IndexStyle istyle,
- StyleAttributes& style );
diff --git a/app-office/kformula/kformula-1.6.2.ebuild b/app-office/kformula/kformula-1.6.2.ebuild
deleted file mode 100644
index 0757368e7949..000000000000
--- a/app-office/kformula/kformula-1.6.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.6.2.ebuild,v 1.15 2009/06/30 20:50:42 tampakrap Exp $
-
-MAXKOFFICEVER=1.6.3
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice formula editor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
- || ( =kde-base/kcontrol-3.5* =kde-base/kdebase-3.5* )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-KMCOPYLIB="
- libkformula lib/kformula
- libkofficecore lib/kofficecore
- libkofficeui lib/kofficeui
- libkopainter lib/kopainter
- libkotext lib/kotext
- libkwmf lib/kwmf
- libkowmf lib/kwmf
- libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kformula"
-
-need-kde 3.4
-
-src_unpack() {
- kde-meta_src_unpack
-
- # Fixing desktop files, cf. bug 190006
- sed -i -e "s:x-kformula$:x-kformula;:g" "${S}"/kformula/kformula.desktop
-
- epatch "${FILESDIR}"/${P}-gcc-4.3.patch # 214365
-}