packages: koffice/koffice-branch.diff, koffice/branch.sh - do some filterin...
glen
glen at pld-linux.org
Tue Aug 25 01:55:03 CEST 2009
Author: glen Date: Mon Aug 24 23:55:03 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- do some filtering to match tarball
---- Files affected:
packages/koffice:
koffice-branch.diff (1.3 -> 1.4) , branch.sh (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/koffice/koffice-branch.diff
diff -u packages/koffice/koffice-branch.diff:1.3 packages/koffice/koffice-branch.diff:1.4
--- packages/koffice/koffice-branch.diff:1.3 Tue Aug 25 01:10:19 2009
+++ packages/koffice/koffice-branch.diff Tue Aug 25 01:54:57 2009
@@ -19517,81 +19517,6 @@
KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(),
Index: krita/core/kis_perspective_math.cpp
===================================================================
---- krita/core/kis_perspective_math.cpp (.../tags/koffice/1.6.3/koffice) (revision 1015224)
-+++ krita/core/kis_perspective_math.cpp (.../branches/koffice/1.6/koffice) (revision 1015224)
-@@ -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++)
Index: krita/data/krita_tool.desktop
===================================================================
--- krita/data/krita_tool.desktop (.../tags/koffice/1.6.3/koffice) (revision 1015224)
@@ -24295,50 +24220,8 @@
Index: kspread/plugins/scripting/kspreadcore/krs_cell.cpp
===================================================================
---- kspread/plugins/scripting/kspreadcore/krs_cell.cpp (.../tags/koffice/1.6.3/koffice) (revision 1015224)
-+++ kspread/plugins/scripting/kspreadcore/krs_cell.cpp (.../branches/koffice/1.6/koffice) (revision 1015224)
-@@ -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 ();
-
Index: kspread/plugins/scripting/kspreadcore/krs_cell.h
===================================================================
---- kspread/plugins/scripting/kspreadcore/krs_cell.h (.../tags/koffice/1.6.3/koffice) (revision 1015224)
-+++ kspread/plugins/scripting/kspreadcore/krs_cell.h (.../branches/koffice/1.6/koffice) (revision 1015224)
-@@ -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".
Index: kspread/plugins/scripting/kspreadscripting.desktop
===================================================================
--- kspread/plugins/scripting/kspreadscripting.desktop (.../tags/koffice/1.6.3/koffice) (revision 1015224)
================================================================
Index: packages/koffice/branch.sh
diff -u packages/koffice/branch.sh:1.1 packages/koffice/branch.sh:1.2
--- packages/koffice/branch.sh:1.1 Tue Aug 25 01:10:41 2009
+++ packages/koffice/branch.sh Tue Aug 25 01:54:57 2009
@@ -5,7 +5,17 @@
ver=1.6.3
branch=1.6
+filter() {
+ set -x
+ # - filter out already patched files (regenerated tarball???)
+ filterdiff -x krita/core/kis_perspective_math.cpp | \
+ filterdiff -x kspread/plugins/scripting/kspreadcore/krs_cell.cpp | \
+ filterdiff -x kspread/plugins/scripting/kspreadcore/krs_cell.h | \
+ # - remove rcs id
+ sed -e 's/$''Id:.*$/$''Id$/'
+}
+
svn diff \
svn://anonsvn.kde.org/home/kde/tags/$prog/$ver/$prog \
svn://anonsvn.kde.org/home/kde/branches/$prog/$branch/$prog \
- > koffice-branch.diff
+ | filter > $prog-branch.diff
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/koffice/koffice-branch.diff?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/koffice/branch.sh?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list