Patch for gcc 3.4 to close bug # 50210. Marked stable on amd64.

5 files changed, 65 insertions, 5 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 9433ef517e76..b711078bcf88 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.47 2004/05/14 09:36:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.48 2004/06/09 06:37:38 absinthe Exp $
+
+*koffice-1.3.1-r1 (09 Jun 2004)
+
+  09 Jun 2004; Dylan Carlson <absinthe@gentoo.org>
+  +files/koffice-1.3.1-gcc34.patch, +koffice-1.3.1-r1.ebuild:
+  Patch added for gcc 3.4 compatibility to close bug #50210. (Thanks to G.L.
+  Emigh, A. Rusnak). Marked stable on amd64.
 
   14 May 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.3.1.ebuild:
   Keyword ~alpha.
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 57396f98cda4..670e72aa67be 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,9 +1,12 @@
-MD5 720c240aac229a1f9d7fbc0eec7813cf ChangeLog 6995
-MD5 8c00068e338633707905898f7dd8ddee koffice-1.2.1-r1.ebuild 902
-MD5 2db57e300bea3fee22ace2e159f02653 koffice-1.3.1.ebuild 935
-MD5 27c0370bc8b34a108c86660f12f95e2e koffice-1.3.ebuild 925
+MD5 91aef8f78bc8e587c7479c3366f07a95 ChangeLog 7265
+MD5 fadc5b52404d663825246286d9aa7c65 koffice-1.2.1-r1.ebuild 901
+MD5 d92e255dd8e7ed5d3d29c2696eecea9a koffice-1.3.1.ebuild 934
+MD5 82f0ecf9e40e6768d9e99f176d5cd1ec koffice-1.3.ebuild 924
 MD5 3567b0f5f53ad3a98e67fe21ecb23624 metadata.xml 225
+MD5 13f0eb5bdbe24d05e7e8882eaddcb3a5 koffice-1.3.1-r1.ebuild 1010
 MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1-r1 67
 MD5 65a32b814eb23f48f2392f1ae13ac167 files/digest-koffice-1.3 66
 MD5 48048df40bacada1eaef7e9982f40927 files/digest-koffice-1.3.1 68
 MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
+MD5 48048df40bacada1eaef7e9982f40927 files/digest-koffice-1.3.1-r1 68
+MD5 c2693c413d437317f4bcd2c6aa7a6673 files/koffice-1.3.1-gcc34.patch 497
diff --git a/app-office/koffice/files/digest-koffice-1.3.1-r1 b/app-office/koffice/files/digest-koffice-1.3.1-r1
new file mode 100644
index 000000000000..8a5acfd21fc5
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.3.1-r1
@@ -0,0 +1 @@
+MD5 ad68bab5753cf8d2e32a1d9e0c19495a koffice-1.3.1.tar.bz2 10615570
diff --git a/app-office/koffice/files/koffice-1.3.1-gcc34.patch b/app-office/koffice/files/koffice-1.3.1-gcc34.patch
new file mode 100644
index 000000000000..00987878d3d7
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.3.1-gcc34.patch
@@ -0,0 +1,11 @@
+--- koffice-1.3.1/karbon/widgets/vcanvas.cc.orig	2004-04-12 11:18:46.000000000 +0200
++++ koffice-1.3.1/karbon/widgets/vcanvas.cc	2004-05-09 19:13:47.832815696 +0200
+@@ -311,7 +311,7 @@
+ 	//if( m_view->layersDocker() )
+ //		m_view->layersDocker()->updatePreviews();
+ 	VPainter *p = m_view->painterFactory()->painter();
+-	KoRect rect( rect().x(), rect().y(), rect().width(), rect().height() );
++	KoRect rect( rect.x(), rect.y(), rect.width(), rect.height() );
+ 	p->blit( rect );
+ 
+ 	// draw handle:
diff --git a/app-office/koffice/koffice-1.3.1-r1.ebuild b/app-office/koffice/koffice-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..5bffcc79ea19
--- /dev/null
+++ b/app-office/koffice/koffice-1.3.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.1-r1.ebuild,v 1.1 2004/06/09 06:37:38 absinthe Exp $
+inherit kde
+
+# TODO : mysql support
+# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
+
+need-kde 3
+
+DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
+
+KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha"
+RESTRICT="nomirror"
+
+IUSE=""
+SLOT="0"
+
+DEPEND="$DEPEND
+	>=kde-base/kdelibs-3.1
+	>=dev-lang/python-2.2.1
+	>=media-libs/libart_lgpl-2.3.9
+	>=media-gfx/imagemagick-5.4.5
+	>=app-text/wv2-0.1.8
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	export LIBPYTHON="`python-config --libs`"
+	kde_src_compile
+}