summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/kspread')
-rw-r--r--app-office/kspread/ChangeLog10
-rw-r--r--app-office/kspread/Manifest6
-rw-r--r--app-office/kspread/files/kspread-1.6.3-validate-desktop.diff11
-rw-r--r--app-office/kspread/files/kspread-gcc43.patch46
-rw-r--r--app-office/kspread/kspread-1.6.3_p20090204.ebuild4
5 files changed, 13 insertions, 64 deletions
diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index eeba88a6..a2f1104d 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-office/kspread
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.103 2009/08/12 10:12:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.105 2009/11/01 09:17:08 abcd Exp $
+
+ 01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kspread-1.6.3.ebuild,
+ -files/kspread-1.6.3-validate-desktop.diff, -files/kspread-gcc43.patch:
+ Drop old version
+
+ 27 Sep 2009; Brent Baude <ranger@gentoo.org>
+ kspread-1.6.3_p20090204.ebuild:
+ Marking kspread-1.6.3_p20090204 ppc64 stable for bug 276008
12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-kspread-2.0.0.ebuild, -kspread-2.0.1.ebuild:
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index 8696812d..250d92fe 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,7 +1,5 @@
AUX kspread-1.6.3-gcc44.patch 344 RMD160 3853b8ef510cafb7acadd907dbaaa4b01fdd599b SHA1 a39d23a4c85e15fdee8dc3ef86aa84db0ab61b9c SHA256 9d86dfb5402fe99d8bb34ab560bc18720276671c5b038cad5384d8a14bd251c4
-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.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466
-EBUILD kspread-1.6.3_p20090204.ebuild 1595 RMD160 540e26a95941d6dafd3c2135fc8f77141b9181df SHA1 5016583dc2e06365ce282c1502aeb01104cb4f81 SHA256 5714b5494dab51e557d61ee0992fde40c7b3e5ad1b2d187e046dbca8e6e4280c
-MISC ChangeLog 12147 RMD160 19d5157a435f5e268fad6b4e1023e037eb28a683 SHA1 07a8ac6dd321fdd25bab3fb51434c7fdfb18f71a SHA256 2e5a7127d92a6c8a9d888ea4c889b2b5d2c3648e576f547da56374c5e45c0de1
+EBUILD kspread-1.6.3_p20090204.ebuild 1593 RMD160 6fbd0e8df101d4d858154cc89813a5a66f29498b SHA1 4d350eae581796297122ed46cabf60c060e48c44 SHA256 3278badeb22341be55c714c82bb92fda7010caa2c592190e80697594377f8fc8
+MISC ChangeLog 12452 RMD160 bc8a06f6709844a2560cbbd24b38f2b5a661e6cb SHA1 2a70c606d13197d87943286e2585a0382108c836 SHA256 79bc54c1725d854e6ed7a722000053567dfef65d062b0a9a608d89afa877426f
MISC metadata.xml 251 RMD160 3c3b2fcd341b05560e1dbee57312b4ea2b58743c SHA1 9311ba89b57f0be473ac87fdfe02a199dda49297 SHA256 27d3543025845d9e297f029fb35c2c090003943d6f27ee7e3a734e2fc7ff07c4
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
deleted file mode 100644
index 8b361026..00000000
--- a/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 9ac8a6f6..00000000
--- a/app-office/kspread/files/kspread-gcc43.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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_p20090204.ebuild b/app-office/kspread/kspread-1.6.3_p20090204.ebuild
index b6cb9a44..79088a2b 100644
--- a/app-office/kspread/kspread-1.6.3_p20090204.ebuild
+++ b/app-office/kspread/kspread-1.6.3_p20090204.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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_p20090204.ebuild,v 1.8 2009/07/23 14:10:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3_p20090204.ebuild,v 1.9 2009/09/27 12:36:06 ranger Exp $
ARTS_REQUIRED="never"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
DEPEND="~app-office/koffice-libs-1.6.3_p20090204