Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnome22.git;a=commitdiff;h=5ced7c826908b5b9cf35eb0ac9229cfb1e837586
commit 5ced7c826908b5b9cf35eb0ac9229cfb1e837586 Author: crazy <[EMAIL PROTECTED]> Date: Sat Apr 12 12:34:55 2008 +0200 koffice-1.6.3-4-i686 * rebuilt wit poppler * added gcc43 patch diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index 017a484..6d8df0f 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -4,12 +4,12 @@ pkgname=koffice pkgver=1.6.3 -pkgrel=3 +pkgrel=4 pkgdesc="An integrated Office suite for KDE" url="http://www.koffice.org"; -depends=('libkexif' 'kdebase>=3.5.8' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ - 'python>=2.5' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt>=0.6.2' 'graphicsmagick>=1.1.8' 'readline') -makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.8' 'mysql' 'pkgconfig' 'postgresql') +depends=('libkexif' 'kdebase>=3.5.9' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ + 'python>=2.5' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt>=0.8.0' 'graphicsmagick>=1.1.8' 'readline') +makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.9' 'mysql' 'pkgconfig' 'postgresql') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_split_docs=1 @@ -20,7 +20,8 @@ up2date="lynx -dump http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/src/|F source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2 \ desktop-files.patch \ ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff \ - ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) + ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff \ + gcc-43.patch) subpkgs=("$pkgname-docs") subdescs=('Koffice Documentation.') @@ -28,10 +29,10 @@ subdepends=("$pkgname>=$pkgver") subgroups=('kde-extra') subarchs=('i686 x86_64') -export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3' \ 'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a' \ 'bff4f540389a77320bc87e2dedece50b82932e59' \ - 'a3d1d85567ccf729a2237f4aa837f7e025ce00ae') + 'a3d1d85567ccf729a2237f4aa837f7e025ce00ae' \ + '807e3717de8710621007556a41e72fe89ee5cba2') # optimization OK diff --git a/source/kde-extra/koffice/gcc-43.patch b/source/kde-extra/koffice/gcc-43.patch new file mode 100644 index 0000000..20d172b --- /dev/null +++ b/source/kde-extra/koffice/gcc-43.patch @@ -0,0 +1,163 @@ +diff -Naur koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx koffice-1.6.3-p/filters/kword/wordperfect/import/TableStyle.cxx +--- koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx 2007-05-30 23:39:02.000000000 +0200 ++++ koffice-1.6.3-p/filters/kword/wordperfect/import/TableStyle.cxx 2008-04-12 03:14:30.000000000 +0200 +@@ -36,6 +36,8 @@ + #include <minmax.h> + #endif + ++#include <cstring> ++ + TableCellStyle::TableCellStyle(const WPXPropertyList &xPropList, const char *psName) : + Style(psName), + mPropList(xPropList) +diff -Naur koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx koffice-1.6.3-p/filters/kword/wordperfect/import/TextRunStyle.cxx +--- koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx 2007-05-30 23:39:02.000000000 +0200 ++++ koffice-1.6.3-p/filters/kword/wordperfect/import/TextRunStyle.cxx 2008-04-12 03:14:30.000000000 +0200 +@@ -37,6 +37,8 @@ + #include <minmax.h> + #endif + ++#include <cstring> ++ + ParagraphStyle::ParagraphStyle(WPXPropertyList *pPropList, const WPXPropertyListVector &xTabStops, const WPXString &sName) : + mpPropList(pPropList), + mxTabStops(xTabStops), +diff -Naur koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp koffice-1.6.3-p/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp +--- koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2007-05-30 23:35:49.000000000 +0200 ++++ koffice-1.6.3-p/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2008-04-12 03:14:30.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include <klocale.h> + #include <kdebug.h> ++#include <stdlib.h> + + using namespace KexiDB; + +diff -Naur koffice-1.6.3/krita/core/kis_perspective_math.cpp koffice-1.6.3-p/krita/core/kis_perspective_math.cpp +--- koffice-1.6.3/krita/core/kis_perspective_math.cpp 2007-05-30 23:40:31.000000000 +0200 ++++ koffice-1.6.3-p/krita/core/kis_perspective_math.cpp 2008-04-12 03:13:31.000000000 +0200 +@@ -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() +@@ -59,7 +59,7 @@ + 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 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] << ")" << 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/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice-1.6.3-p/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-1.6.3-p/kspread/plugins/scripting/kspreadcore/krs_cell.cpp 2008-04-12 03:14:30.000000000 +0200 +@@ -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 -Naur koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice-1.6.3-p/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-1.6.3-p/kspread/plugins/scripting/kspreadcore/krs_cell.h 2008-04-12 03:14:30.000000000 +0200 +@@ -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 -Naur koffice-1.6.3/lib/kross/ruby/rubyinterpreter.cpp koffice-1.6.3-p/lib/kross/ruby/rubyinterpreter.cpp +--- koffice-1.6.3/lib/kross/ruby/rubyinterpreter.cpp 2007-05-30 23:38:32.000000000 +0200 ++++ koffice-1.6.3-p/lib/kross/ruby/rubyinterpreter.cpp 2008-04-12 03:13:31.000000000 +0200 +@@ -55,7 +55,7 @@ + } + return 0; + } +-}; ++} + + + namespace Kross { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
