Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=5ae3a0a88e313e1db2a31bf41f0589ede06b8a54

commit 5ae3a0a88e313e1db2a31bf41f0589ede06b8a54
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sun Jan 10 01:26:16 2010 +0100

koffice-2.1.0-1-i686

- version bump

diff --git a/source/kde-extra/koffice/FrugalBuild 
b/source/kde-extra/koffice/FrugalBuild
index b0d0709..03b6495 100644
--- a/source/kde-extra/koffice/FrugalBuild
+++ b/source/kde-extra/koffice/FrugalBuild
@@ -3,38 +3,29 @@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=koffice
-pkgver=1.6.3
-pkgrel=8
+pkgver=2.1.0
+pkgrel=1
pkgdesc="An integrated Office suite for KDE"
url="http://www.koffice.org";
-depends=('libkexif' 'kdebase>=3.5.10-3' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 
'libwpd' \
-       'python>=2.6' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt>=0.8.0' 
'imagemagick' 'readline')
-makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.9' 'mysql' 
'pkgconfig' 'postgresql')
+_F_cmakekde_final=FALSE
+Finclude kde
+depends=('libkexif' "kdebase>=$_F_kde_ver" 'libpqxx=2.6.9' 'wv2' 
'libmysqlclient' 'libwpd' \
+       'python>=2.6' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt4>=0.8.0' 
'imagemagick' 'readline')
+makedepends=('doxygen' 'qt-docs>=3.3.6' 'mysql' 'pkgconfig' 'postgresql')
groups=('kde-extra')
archs=('i686' 'x86_64' 'ppc')
_F_kde_split_docs=1
options=('nodocs')
-Finclude kde
url="http://www.koffice.org";
-up2date="lynx -dump 
http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/src/|Flasttar"
-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
 \
-       gcc-43.patch digest_cc.diff glibc210.diff)
+up2date="Flasttar http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/";
+source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/$pkgname-$pkgver.tar.bz2)

subpkgs=("$pkgname-docs")
subdescs=('Koffice Documentation.')
-subdepends=("$pkgname>=$pkgver")
+subrodepends=("$pkgname>=$pkgver")
subgroups=('kde-extra')
subarchs=('i686 x86_64 ppc')

-sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3' \
-          'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a' \
-          'bff4f540389a77320bc87e2dedece50b82932e59' \
-          'a3d1d85567ccf729a2237f4aa837f7e025ce00ae' \
-          '807e3717de8710621007556a41e72fe89ee5cba2' \
-          '76f840156fa3105ceebd3628796af26d9d1bc951' \
-          '58ee7b81dca085692d063f064ece89b514135f65')
+sha1sums=('0fd0bf64e6d166d41bae41730b17d5194e7f5adf')

# optimization OK
diff --git a/source/kde-extra/koffice/desktop-files.patch 
b/source/kde-extra/koffice/desktop-files.patch
deleted file mode 100644
index a2e7716..0000000
--- a/source/kde-extra/koffice/desktop-files.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -Nurp koffice-1.6.0/filters/krita/jpeg/krita_jpeg.desktop 
koffice-1.6.0-p/filters/krita/jpeg/krita_jpeg.desktop
---- koffice-1.6.0/filters/krita/jpeg/krita_jpeg.desktop        2006-10-07 
15:33:33.000000000 +0200
-+++ koffice-1.6.0-p/filters/krita/jpeg/krita_jpeg.desktop      2006-10-23 
02:34:13.000000000 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=
-+NoDisplay=true
- Encoding=UTF-8
- Exec=krita %u
- GenericName=Application for Drawing and Handling of Images
-diff -Nurp koffice-1.6.0/karbon/data/karbon.desktop 
koffice-1.6.0-p/karbon/data/karbon.desktop
---- koffice-1.6.0/karbon/data/karbon.desktop   2006-10-07 15:38:10.000000000 
+0200
-+++ koffice-1.6.0-p/karbon/data/karbon.desktop 2006-10-23 02:36:28.000000000 
+0200
-@@ -63,4 +63,4 @@ InitialPreference=5
- Type=Application
- Icon=karbon
- X-KDE-NativeMimeType=application/x-karbon
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-diff -Nurp koffice-1.6.0/kchart/kchart.desktop 
koffice-1.6.0-p/kchart/kchart.desktop
---- koffice-1.6.0/kchart/kchart.desktop        2006-10-07 15:35:49.000000000 
+0200
-+++ koffice-1.6.0-p/kchart/kchart.desktop      2006-10-23 02:37:42.000000000 
+0200
-@@ -95,4 +95,4 @@ X-KDE-NativeMimeType=application/vnd.oas
- X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-diff -Nurp koffice-1.6.0/kformula/kformula.desktop 
koffice-1.6.0-p/kformula/kformula.desktop
---- koffice-1.6.0/kformula/kformula.desktop    2006-10-07 15:27:55.000000000 
+0200
-+++ koffice-1.6.0-p/kformula/kformula.desktop  2006-10-23 02:39:29.000000000 
+0200
-@@ -75,4 +75,4 @@ Icon=kformula
- X-KDE-NativeMimeType=application/vnd.oasis.opendocument.formula
- X-DCOP-ServiceType=Multi
- DocPath=kformula/index.html
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-diff -Nurp koffice-1.6.0/krita/krita.desktop 
koffice-1.6.0-p/krita/krita.desktop
---- koffice-1.6.0/krita/krita.desktop  2006-10-07 15:35:38.000000000 +0200
-+++ koffice-1.6.0-p/krita/krita.desktop        2006-10-23 02:34:54.000000000 
+0200
-@@ -69,7 +69,7 @@ GenericName[zh_TW]=繪圖與影像編輯
- MimeType=application/x-krita
- Type=Application
- Icon=krita
--Categories=Qt;KDE;Office;Graphics;
-+Categories=Qt;KDE;Graphics;
- X-KDE-NativeMimeType=application/x-krita
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
-diff -Nurp koffice-1.6.0/kugar/kudesigner/kudesigner.desktop 
koffice-1.6.0-p/kugar/kudesigner/kudesigner.desktop
---- koffice-1.6.0/kugar/kudesigner/kudesigner.desktop  2006-10-07 
15:33:42.000000000 +0200
-+++ koffice-1.6.0-p/kugar/kudesigner/kudesigner.desktop        2006-10-23 
02:47:05.000000000 +0200
-@@ -3,7 +3,7 @@
- Encoding=UTF-8
- Type=Application
- Exec=kudesigner %u
--Icon=kudesigner
-+Icon=kugar
- DocPath=kugar/index.html
- Terminal=false
- Name=Kugar Designer
-@@ -137,5 +137,4 @@ MimeType=application/x-kudesigner
- X-KDE-NativeMimeType=application/x-kudesigner
- X-KDE-Library=libkudesignerpart
- ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
--
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-diff -Nurp koffice-1.6.0/tools/kthesaurus/KThesaurus.desktop 
koffice-1.6.0-p/tools/kthesaurus/KThesaurus.desktop
---- koffice-1.6.0/tools/kthesaurus/KThesaurus.desktop  2006-10-07 
15:29:15.000000000 +0200
-+++ koffice-1.6.0-p/tools/kthesaurus/KThesaurus.desktop        2006-10-23 
03:15:21.000000000 +0200
-@@ -69,4 +69,5 @@ GenericName[xh]=Amagama Ahlobeneyo
- GenericName[zh_CN]=相关单词
- GenericName[zh_TW]=相關單字
- X-KDE-StartupNotify=true
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-+NoDisplay=true
diff --git a/source/kde-extra/koffice/digest_cc.diff 
b/source/kde-extra/koffice/digest_cc.diff
deleted file mode 100644
index 596c59f..0000000
--- a/source/kde-extra/koffice/digest_cc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kspread-1.6.3_p20090204/kspread/digest.cc  2006/03/24 09:20:42     522032
-+++ kspread-1.6.3_p20090204/kspread/digest.cc  2009/02/26 10:09:03     932093
-@@ -50,7 +50,7 @@
-
- #if  SIZEOF_INT == 4
- typedef unsigned int sal_uInt32;
--#elif
-+#else
- typedef unsigned long sal_uInt32;
- #endif
-
diff --git a/source/kde-extra/koffice/gcc-43.patch 
b/source/kde-extra/koffice/gcc-43.patch
deleted file mode 100644
index 20d172b..0000000
--- a/source/kde-extra/koffice/gcc-43.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-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 {
diff --git a/source/kde-extra/koffice/glibc210.diff 
b/source/kde-extra/koffice/glibc210.diff
deleted file mode 100644
index 4916368..0000000
--- a/source/kde-extra/koffice/glibc210.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- kword-1.6.3_p20090519/filters/kword/pdf/xpdf/goo/gfile.cc  2009-05-25 
15:51:25.000000000 +0100
-+++ kword-1.6.3_p20090519/filters/kword/pdf/xpdf/goo/gfile.cc  2009-05-25 
15:51:20.000000000 +0100
-@@ -277,7 +277,7 @@
- GString *grabPath(const char *fileName) {
- #ifdef VMS
-   //---------- VMS ----------
--  char *p;
-+  const char *p;
-
-   if ((p = strrchr(fileName, ']')))
-     return new GString(fileName, p + 1 - fileName);
-@@ -287,7 +287,7 @@
-
- #elif defined(__EMX__) || defined(WIN32)
-   //---------- OS/2+EMX and Win32 ----------
--  char *p;
-+  const char *p;
-
-   if ((p = strrchr(fileName, '/')))
-     return new GString(fileName, p - fileName);
-@@ -300,7 +300,7 @@
-
- #elif defined(ACORN)
-   //---------- RISCOS ----------
--  char *p;
-+  const char *p;
-
-   if ((p = strrchr(fileName, '.')))
-     return new GString(fileName, p - fileName);
-@@ -307,7 +307,7 @@
-
- #elif defined(MACOS)
-   //---------- MacOS ----------
--  char *p;
-+  const char *p;
-
-   if ((p = strrchr(fileName, ':')))
-     return new GString(fileName, p - fileName);
-@@ -315,7 +315,7 @@
-
- #else
-   //---------- Unix ----------
--  char *p;
-+  const char *p;
-
-   if ((p = strrchr(fileName, '/')))
-     return new GString(fileName, p - fileName);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to