[arch-commits] Commit in koffice/repos (3 files)
Eric Belanger
eric at archlinux.org
Wed Apr 23 03:24:46 UTC 2008
Date: Tuesday, April 22, 2008 @ 23:24:46
Author: eric
Revision: 765
Merged revisions 2-764 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/koffice/trunk
........
r205 | eric | 2008-04-13 18:30:39 -0400 (Sun, 13 Apr 2008) | 2 lines
upgpkg: koffice 1.6.3-3
rebuild for imagemagick 6.4.0.2
........
r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
Added:
koffice/repos/extra-i686/koffice-1.6.3-gcc43.patch
(from rev 356, koffice/trunk/koffice-1.6.3-gcc43.patch)
Modified:
koffice/repos/extra-i686/ (properties)
koffice/repos/extra-i686/PKGBUILD
---------------------------+
PKGBUILD | 9 +-
koffice-1.6.3-gcc43.patch | 153 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+), 4 deletions(-)
Property changes on: koffice/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /koffice/trunk:1
+ /koffice/trunk:1-764
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-04-23 03:22:26 UTC (rev 764)
+++ extra-i686/PKGBUILD 2008-04-23 03:24:46 UTC (rev 765)
@@ -3,16 +3,17 @@
pkgname=koffice
pkgver=1.6.3
stable=stable # stable|unstable
-pkgrel=2
+pkgrel=3
pkgdesc="An integrated Office suite for KDE"
license=('GPL' 'LGPL')
arch=(i686 x86_64)
url="http://www.koffice.org"
-depends=('kdelibs>=3.5.5' 'aspell' 'wv2' 'imagemagick>=6.3.0.7' 'python>=2.5' 'libwpd' \
+depends=('kdelibs>=3.5.5' 'aspell' 'wv2' 'imagemagick>=6.4.0.2' 'python>=2.5' 'libwpd' \
'libxslt' 'libexif' 'libgl' 'openexr>=1.4.0a')
makedepends=('pkgconfig' 'libpqxx>=2.6.8' 'libmysqlclient' 'ruby')
-source=(http://download.kde.org/stable/koffice-${pkgver}/src/koffice-${pkgver}.tar.bz2)
+source=(http://download.kde.org/stable/koffice-${pkgver}/src/koffice-${pkgver}.tar.bz2 koffice-1.6.3-gcc43.patch)
+md5sums=('386d388094734f9759977c3267098e30' '7bc8e0d4c89adf589c992c439023ea44')
build() {
# Source the QT and KDE profile
@@ -20,6 +21,7 @@
[ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
cd ${startdir}/src/${pkgname}-${pkgver}
+ patch -p1 < ../koffice-1.6.3-gcc43.patch || return 1
#make -f Makefile.cvs
./configure --prefix=/opt/kde --enable-new-ldflags --disable-debug \
@@ -30,4 +32,3 @@
rm -rf ${startdir}/pkg/opt/kde/share/doc
}
-md5sums=('386d388094734f9759977c3267098e30')
Copied: koffice/repos/extra-i686/koffice-1.6.3-gcc43.patch (from rev 356, koffice/trunk/koffice-1.6.3-gcc43.patch)
===================================================================
--- extra-i686/koffice-1.6.3-gcc43.patch (rev 0)
+++ extra-i686/koffice-1.6.3-gcc43.patch 2008-04-23 03:24:46 UTC (rev 765)
@@ -0,0 +1,153 @@
+diff -Naur koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx
+--- koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx 2008-04-12 21:18:16.000000000 -0400
++++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx 2008-04-12 21:25:04.000000000 -0400
+@@ -28,6 +28,7 @@
+ * Corel Corporation or Corel Corporation Limited."
+ */
+ #include <math.h>
++#include <cstring>
+ #include "FilterInternal.hxx"
+ #include "TableStyle.hxx"
+ #include "DocumentElement.hxx"
+diff -Naur koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx
+--- koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx 2008-04-12 21:18:16.000000000 -0400
++++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx 2008-04-12 21:24:42.000000000 -0400
+@@ -28,6 +28,7 @@
+ /* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
++#include <cstring>
+ #include "FilterInternal.hxx"
+ #include "TextRunStyle.hxx"
+ #include "WriterProperties.hxx"
+diff -Naur koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+--- koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2008-04-12 21:18:16.000000000 -0400
++++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2008-04-12 21:24:04.000000000 -0400
+@@ -26,6 +26,7 @@
+
+ #include <klocale.h>
+ #include <kdebug.h>
++#include <cstdlib>
+
+ using namespace KexiDB;
+
+diff -Naur koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp koffice-1.6.3/krita/core/kis_perspective_math.cpp
+--- koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp 2008-04-12 21:18:16.000000000 -0400
++++ koffice-1.6.3/krita/core/kis_perspective_math.cpp 2008-04-12 21:20:27.000000000 -0400
+@@ -24,7 +24,7 @@
+
+ #if 1
+
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ #include <math.h>
+ //#define NDEBUG // uncomment to remove checking of assert()
+@@ -57,9 +57,9 @@
+ void rprint()const; //print entries on a single line
+ void resize(int n);
+ int operator==(const vector<ElType>& v)const;
+- friend vector<ElType> operator*(ElType c,vector<ElType>& v );
+- friend vector<ElType> operator*(vector<ElType>& v,ElType c );
+- friend ostream& operator<<(ostream& s,vector<ElType>& v);
++ friend vector<ElType> operator* (ElType c,vector<ElType>& v );
++ friend vector<ElType> operator*(vector<ElType>& v,ElType c );
++ friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
+ };
+ template <class ElType>
+ void vector<ElType>::zero()
+@@ -129,10 +129,10 @@
+ void vector<ElType>::rprint()const //print entries on a single line
+ {
+ int i;
+- cout << "VECTOR: ";
+- cout << "(";
+- for(i=0;i<len-1;i++) cout << data[i] << ",";
+- cout << data[len-1] << ")" << endl;
++ std::cout << "VECTOR: ";
++ std::cout << "(";
++ for(i=0;i<len-1;i++) std::cout << data[i] << ",";
++ std::cout << data[len-1] << ")" << std::endl;
+ return;
+ }
+ template <class ElType>
+@@ -164,7 +164,7 @@
+ return ans;
+ }
+ template <class ElType>
+- ostream& operator<<(ostream& s,vector<ElType>& v)
++ std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
+ {
+ s << "(";
+ for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
+@@ -192,7 +192,7 @@
+ matrix<ElType> operator-(const matrix<ElType>& a);
+ matrix<ElType> transpose();
+ //matrix<ElType> inverse();
+- friend ostream& operator<<(ostream& s,matrix<ElType>& m);
++ friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
+ friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
+ friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
+ };
+@@ -357,7 +357,7 @@
+ return ans;
+ }
+ template <class ElType>
+- ostream& operator<<(ostream& s,matrix<ElType>& m)
++ std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
+ {
+ for(int i=0; i<m.rows;i++) s << m[i];
+ return s;
+@@ -381,7 +381,7 @@
+ // kdDebug() << "new search" << endl;
+ for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
+ /* kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
+- if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
++ if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
+ vv[i]=1.0/big;
+ }
+ for (j=0;j<n;j++)
+diff -Naur koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
+--- koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.cpp 2008-04-12 21:18:17.000000000 -0400
++++ koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp 2008-04-12 21:22:45.000000000 -0400
+@@ -174,12 +174,8 @@
+ 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 +185,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 -Naur koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h
+--- koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h 2008-04-12 21:18:17.000000000 -0400
++++ koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h 2008-04-12 21:22:55.000000000 -0400
+@@ -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".
More information about the arch-commits
mailing list