kspread bump with gcc43 patch and desktop-validity fix

Package-Manager: portage-2.1.5

5 files changed, 147 insertions, 3 deletions

diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 310ea73cc16a..c5c69ab7d818 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kspread
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.83 2007/07/26 17:36:03 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.84 2008/05/17 14:52:28 hanno Exp $
+
+*kspread-1.6.3 (17 May 2008)
+
+  17 May 2008; Hanno Boeck <hanno@gentoo.org> +files/kspread-gcc43.patch,
+  +files/kspread-1.6.3-validate-desktop.diff, +kspread-1.6.3.ebuild:
+  Fix gcc 4.3, fix desktop validity.
 
   26 Jul 2007; Markus Rothe <corsair@gentoo.org> kspread-1.6.2.ebuild:
   Stable on ppc64; bug #178697
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index a263d0fc5629..46c6b7acd117 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kspread-1.6.3-validate-desktop.diff 644 RMD160 78d1d7b51d0b7f94d733d969d8e6df35c7bf3be8 SHA1 9a701530409109358d1f99db0a760f61e4940307 SHA256 d12d9722cbe8cda1fbf9ff76b857c5fc75307728670c404a085ab93227860737
+AUX kspread-gcc43.patch 1845 RMD160 86e2307aeb68287ab86701b3e3df5669f9101df7 SHA1 0f2e1bf3e8fc73b22fd1f9e8d8c84e532107a6d0 SHA256 baf156ff701c8f7b7e68d8f6b74658f1fce28003bc768a7807d848a6704e71b5
 DIST koffice-1.6.1.tar.bz2 56999028 RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db SHA1 891fb0a28ec3c4b070c4d6c2eae7fee1d2e37761 SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728
 DIST koffice-1.6.2.tar.bz2 57049103 RMD160 fb4ef5870870d80481a4a9d2864199428f495460 SHA1 a6a0dcc254f7a7f90d7e5b31f6ebecd54800f211 SHA256 fa5ca02eba02219d34c3c6efff92bf767060b4b1343da56eb63139661d53f380
+DIST koffice-1.6.3.tar.bz2 56829391 RMD160 e474ba48fa983fafb61ad58fb79cddda69ec6908 SHA1 de84214dec913eac1d47dab04dd93f3d81729fd3 SHA256 c3975f0a59f50aaa5547f1709b6fad54f746fd06815859b374676b426dce12cb
 EBUILD kspread-1.6.1.ebuild 1580 RMD160 f6af2064ef73a9a569e9dd11b1b4dc42d11257ad SHA1 3adece8aae8f0557e5372116aa624874bad9d1ba SHA256 99e48f5808044b81c276521546871329af133bba2b4d60fe000e0ab53d034c9c
 EBUILD kspread-1.6.2.ebuild 1584 RMD160 5029294df0512801159e0844356bc351fb1dbea1 SHA1 bacf1094be140ceced4376ed67dbd93d04875528 SHA256 952c742936f50870794a2c71ab1d91f0a7ac1c2cb3f36642612ef4bdb87cf675
-MISC ChangeLog 9466 RMD160 fe0e94058c2cb8b085ff84b16a9dec8d28a7a6f6 SHA1 7c02cadb75ffa724d02725984e1c6afe350fb630 SHA256 106158ee7c2b983f9c342d23144129c4364a8c575cb524ec7b19ea13d522d09b
+EBUILD kspread-1.6.3.ebuild 1684 RMD160 11a5115e9592cd73c09ea518fd626175ba8c5923 SHA1 3497b03664e4d64db2fec69636e2b5811d19c35c SHA256 895249af3915d305c600b75f83c6218ffb8c1085fb54a86e752d075acc2d76a6
+MISC ChangeLog 9675 RMD160 7ea913d20da425839b5e793614cd8b62c99fc1dc SHA1 7d7a020b07fa668d8502cd6f576166097711027e SHA256 3105248e4ed4f66d2dce99979bd14c58a029ac686970b3cd279632615c8ae544
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgu8TwACgkQr2QksT29OyDuWQCfeEuaURDJY7SUsccODUAfaxog
+llkAn1hB1M4LuCsKu4Z9qsCbIIwqrCu3
+=OfpC
+-----END PGP SIGNATURE-----
diff --git a/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff b/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff
new file mode 100644
index 000000000000..8b361026e483
--- /dev/null
+++ b/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff
@@ -0,0 +1,11 @@
+--- koffice-1.6.3/kspread/kspread.desktop.orig	2008-05-17 16:04:28.000000000 +0200
++++ koffice-1.6.3/kspread/kspread.desktop	2008-05-17 16:04:34.000000000 +0200
+@@ -70,7 +70,7 @@
+ GenericName[wa]=Tåvleus
+ GenericName[zh_CN]=电子表格
+ GenericName[zh_TW]=Spread 表格
+-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro
++MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro;
+ Type=Application
+ Icon=kspread
+ X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
diff --git a/app-office/kspread/files/kspread-gcc43.patch b/app-office/kspread/files/kspread-gcc43.patch
new file mode 100644
index 000000000000..9ac8a6f6dfe6
--- /dev/null
+++ b/app-office/kspread/files/kspread-gcc43.patch
@@ -0,0 +1,46 @@
+diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
+--- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2007-05-30 23:43:20.000000000 +0200
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2008-03-12 00:59:07.000000000 +0100
+@@ -174,12 +174,7 @@
+ 	return m_cell->text();
+ }
+ 
+-bool Cell::setText(const QString& text, bool asString) {
+-
+-	//FIXME: there is some problem with asString parameter, when it's set
+-	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
+-	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
+-
++bool Cell::setText(const QString& text) {
+ 	KSpread::ProtectedCheck prot;
+ 	prot.setSheet (m_sheet);
+ 	prot.add (QPoint (m_col, m_row));
+@@ -189,7 +184,7 @@
+ 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
+ 	dm->setSheet (m_sheet);
+ 	dm->setValue (text);
+-	dm->setParsing (!asString);
++	dm->setParsing (true);
+ 	dm->add (QPoint (m_col, m_row));
+ 	dm->execute ();
+ 
+diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
+--- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h	2007-05-30 23:43:20.000000000 +0200
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	2008-03-12 00:59:07.000000000 +0100
+@@ -131,11 +131,10 @@
+ 		*/
+ 		const QString text() const;
+ 		/**
+-		* Set the text of the cell. If asString is true, the text
+-		* will be handled as string else we try to parse the
+-		* string to the expected value.
++		* Set the text of the cell. the text
++		* will be handled as string
+ 		*/
+-		bool setText(const QString& text, bool asString = false);
++		bool setText(const QString& text);
+ 
+ 		/**
+ 		* Return the textcolor as RGB-value in the format "#RRGGBB".
+
+ 
diff --git a/app-office/kspread/kspread-1.6.3.ebuild b/app-office/kspread/kspread-1.6.3.ebuild
new file mode 100644
index 000000000000..212989351c02
--- /dev/null
+++ b/app-office/kspread/kspread-1.6.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3.ebuild,v 1.1 2008/05/17 14:52:28 hanno Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=1.6.3
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice spreadsheet application."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
+	$(deprange $PV $MAXKOFFICEVER app-office/kexi)"
+
+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
+	libkochart interfaces
+	libkrossmain lib/kross/main
+	libkrossapi lib/kross/api
+	libkexidb kexi/kexidb
+	libkexidbparser kexi/kexidb/parser"
+
+KMEXTRACTONLY="lib/
+	interfaces/
+	filters/kexi
+	kexi/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kspread"
+
+PATCHES="${FILESDIR}/kspread-1.6.3-validate-desktop.diff
+	${FILESDIR}/kspread-gcc43.patch"
+
+need-kde 3.4
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
+
+	# Work around broken conditional
+	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
+
+	for i in $(find "${S}"/lib -iname "*\.ui"); do
+		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
+	done
+
+	kde-meta_src_unpack makefiles
+}