Code patch to gcc-3.1 support. Will be sent as an upstream patch if

necessary.

4 files changed, 138 insertions, 1 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 67939314613f..af41097a07c0 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.4 2002/04/26 22:51:42 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.5 2002/05/27 20:34:51 mkennedy Exp $
+
+*koffice-1.2_beta1-r2 (27 May 2002)
+
+  27 May 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  koffice-1.2_beta1-r2.ebuild, files/digest-koffice-1.2_beta1-r2,
+  files/koffice-1.2-beta1-gcc31-gentoo.patch :
+
+  Code patch to support gcc-3.1. May not be necessary with next
+  release of koffice.
 
 *koffice-1.2_beta1-r1 (27 April 2002)
 
diff --git a/app-office/koffice/files/digest-koffice-1.2_beta1-r2 b/app-office/koffice/files/digest-koffice-1.2_beta1-r2
new file mode 100644
index 000000000000..b3231873b7fc
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.2_beta1-r2
@@ -0,0 +1 @@
+MD5 5df9c55daabcc5df4327724d40f436cf koffice-1.2-beta1.tar.bz2 7901619
diff --git a/app-office/koffice/files/koffice-1.2-beta1-gcc31-gentoo.patch b/app-office/koffice/files/koffice-1.2-beta1-gcc31-gentoo.patch
new file mode 100644
index 000000000000..6363d2f7f2b4
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.2-beta1-gcc31-gentoo.patch
@@ -0,0 +1,31 @@
+diff -ur koffice-1.2-beta1.original/karbon/tools/vmtool_rotate.cc koffice-1.2-beta1/karbon/tools/vmtool_rotate.cc
+--- koffice-1.2-beta1.original/karbon/tools/vmtool_rotate.cc	Tue Apr  2 07:07:04 2002
++++ koffice-1.2-beta1/karbon/tools/vmtool_rotate.cc	Mon May 27 01:35:56 2002
+@@ -79,7 +79,7 @@
+ 		KoRect rect = part()->selection().boundingBox( 1 / view->zoomFactor() );
+ 		m_sp = QPoint( rect.left() + rect.width() / 2, rect.top() + rect.height() / 2 );
+ 		QPoint sp = QPoint( m_sp.x() - view->canvasWidget()->contentsX(), m_sp.y() - view->canvasWidget()->contentsY() );
+-		m_angle = atan2( lp.y() - m_sp.y(), lp.x() - m_sp.x() );
++		m_angle = atan2( double(lp.y() - m_sp.y()), double(lp.x() - m_sp.x()) );
+ 		if( VMToolHandle::instance( m_part )->activeNode() == NODE_LT )
+ 			m_angle -= atan2( rect.top() - m_sp.y(), rect.left() - m_sp.x() );
+ 		else if( VMToolHandle::instance( m_part )->activeNode() == NODE_MT )
+diff -ur koffice-1.2-beta1.original/karbon/tools/vshapetool.h koffice-1.2-beta1/karbon/tools/vshapetool.h
+--- koffice-1.2-beta1.original/karbon/tools/vshapetool.h	Thu Mar 14 12:50:49 2002
++++ koffice-1.2-beta1/karbon/tools/vshapetool.h	Mon May 27 01:33:58 2002
+@@ -61,12 +61,12 @@
+ 	if( m_calcPolar )
+ 	{
+ 		// radius:
+-		m_d1 = sqrt(
++	  m_d1 = sqrt( double(
+ 			( m_lp.x() - m_fp.x() ) * ( m_lp.x() - m_fp.x() ) +
+-			( m_lp.y() - m_fp.y() ) * ( m_lp.y() - m_fp.y() ) );
++			( m_lp.y() - m_fp.y() ) * ( m_lp.y() - m_fp.y() ) ));
+ 
+ 		// angle:
+-		m_d2 = atan2( ( m_lp.y() - m_fp.y() ), ( m_lp.x() - m_fp.x() ) );
++		m_d2 = atan2( double( m_lp.y() - m_fp.y() ), double( m_lp.x() - m_fp.x() ) );
+ 
+ 		// define pi/2 as "0.0":
+ 		m_d2 -= VGlobal::pi_2;
diff --git a/app-office/koffice/koffice-1.2_beta1-r2.ebuild b/app-office/koffice/koffice-1.2_beta1-r2.ebuild
new file mode 100644
index 000000000000..1766c3860771
--- /dev/null
+++ b/app-office/koffice/koffice-1.2_beta1-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Author Bart Verwilst <verwilst@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta1-r2.ebuild,v 1.1 2002/05/27 20:34:51 mkennedy Exp $
+
+inherit kde-base || die
+
+need-kde 3
+
+S="${WORKDIR}/koffice-1.2-beta1"
+DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+
+SRC_URI="ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2-beta1/src/koffice-1.2-beta1.tar.bz2"
+
+DEPEND="$DEPEND
+	>=dev-lang/python-2.2-r7"
+
+
+src_unpack() {
+	unpack koffice-1.2-beta1.tar.bz2
+	cd ${S}
+	# patch for gcc3.1 support (will be sent upstream too if necessary)
+	patch -p1 <${FILESDIR}/koffice-1.2-beta1-gcc31-gentoo.patch || die
+
+	cd ${S}/kword
+	
+	# This fixes the doc compilation error.. Seems kinda ugly, but beta2 will fix this#
+	cd ${S}/doc/kformula
+	mv index.docbook index.docbook.orig
+        sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/koffice
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kontour
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/koshell
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kpresenter
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kspread
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kugar
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kword
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/thesaurus
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+
+}
+
+src_compile() {
+
+    export LIBPYTHON="`python-config --libs`"
+    export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
+
+    myconf="$myconf --enable-all"
+    kde_src_compile myconf
+
+    #the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
+    CFLAGS2="$CFLAGS"
+    CXXFLAGS2="$CXXFLAGS"
+
+    CFLAGS=${CFLAGS/-fomit-frame-pointer}
+    CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
+
+    cd ${S}
+    kde_src_compile configure
+    cd kchart/kdchart
+    emake || die
+
+    cd ${S}
+    CFLAGS="$CFLAGS2"
+    CXXFLAGS="$CXXFLAGS2"
+    kde_src_compile configure
+    emake || die
+
+}
+
+