rev 9733 - in trunk/packages/koffice/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Wed Mar 12 22:19:57 UTC 2008
Author: ana
Date: 2008-03-12 22:19:57 +0000 (Wed, 12 Mar 2008)
New Revision: 9733
Added:
trunk/packages/koffice/debian/patches/26_gcc4.3.diff
trunk/packages/koffice/debian/patches/31_fix_bashisms.diff
Modified:
trunk/packages/koffice/debian/changelog
Log:
* Fix bashisms, patch 31_fix_bashisms.diff. (Closes: #465001)
* Update to build with GCC 4.3, patch 26_gcc4.3.diff.
(Closes: #441549)
Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog 2008-03-12 21:31:17 UTC (rev 9732)
+++ trunk/packages/koffice/debian/changelog 2008-03-12 22:19:57 UTC (rev 9733)
@@ -8,6 +8,9 @@
* Remove build depends on -1 revision for ruby.
* Add copyright notice in copyright file.
* Update lintian overrides.
+ * Fix bashisms, patch 31_fix_bashisms.diff. (Closes: #465001)
+ * Update to build with GCC 4.3, patch 26_gcc4.3.diff.
+ (Closes: #441549)
+++ Changes by Raúl Sánchez Siles:
@@ -20,7 +23,7 @@
* Add Depends: kghostview to koffice-libs for print preview.
(Closes: #439364)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 11 Mar 2008 17:26:16 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 12 Mar 2008 22:52:32 +0100
koffice (1:1.6.3-4) unstable; urgency=low
Added: trunk/packages/koffice/debian/patches/26_gcc4.3.diff
===================================================================
--- trunk/packages/koffice/debian/patches/26_gcc4.3.diff (rev 0)
+++ trunk/packages/koffice/debian/patches/26_gcc4.3.diff 2008-03-12 22:19:57 UTC (rev 9733)
@@ -0,0 +1,120 @@
+diff -Nrua koffice-1.6.3/krita/core/kis_perspective_math.cpp koffice/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/krita/core/kis_perspective_math.cpp 2008-03-12 00:56:21.000000000 +0100
+@@ -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 -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".
\ No newline at end of file
Added: trunk/packages/koffice/debian/patches/31_fix_bashisms.diff
===================================================================
--- trunk/packages/koffice/debian/patches/31_fix_bashisms.diff (rev 0)
+++ trunk/packages/koffice/debian/patches/31_fix_bashisms.diff 2008-03-12 22:19:57 UTC (rev 9733)
@@ -0,0 +1,96 @@
+--- koffice-1.6.3.orig/kexi/tools/add_column/kexi_add_column
++++ koffice-1.6.3/kexi/tools/add_column/kexi_add_column
+@@ -18,7 +18,7 @@
+ # Boston, MA 02111-1307, USA.
+ #
+
+-function usage {
++usage {
+ echo "This script adds a new empty column to a table in a .kexi (SQLite 3)
+ database file without removing data from the table.
+
+@@ -39,14 +39,14 @@
+ $0 db.kexi cars photo BLOB Photo"
+ }
+
+-function exit_with_error {
++exit_with_error {
+ rm -f "$temp_db"
+ echo $*
+ echo "Error."
+ exit 1
+ }
+
+-function check {
++check {
+ [ -n "$*" ] && exit_with_error "$*"
+ }
+
+--- koffice-1.6.3.orig/kexi/tools/add_column/kexi_add_column_gui
++++ koffice-1.6.3/kexi/tools/add_column/kexi_add_column_gui
+@@ -20,7 +20,7 @@
+
+ basedir=`dirname "$0"`
+
+-function setup_messages {
++setup_messages {
+ lang=`grep Language= ~/.kde/share/config/kdeglobals | head -n 1 | \
+ sed -e 's/Language=\(.*\):.*/\1/'`
+ if [ -z "$lang" ] ; then lang="en" ; fi
+--- koffice-1.6.3.orig/kexi/tools/delete_column/kexi_delete_column
++++ koffice-1.6.3/kexi/tools/delete_column/kexi_delete_column
+@@ -18,7 +18,7 @@
+ # Boston, MA 02111-1307, USA.
+ #
+
+-function usage {
++usage {
+ echo "This script deletes a single table column from a .kexi (SQLite 3)
+ database file without removing data from the table.
+
+@@ -35,14 +35,14 @@
+ $0 db.kexi products price"
+ }
+
+-function exit_with_error {
++exit_with_error {
+ rm -f "$temp_db"
+ echo $*
+ echo "Error."
+ exit 1
+ }
+
+-function check {
++check {
+ [ -n "$*" ] && exit_with_error "$*"
+ }
+
+@@ -62,7 +62,7 @@
+
+ # 1. alter the table physically
+
+-function prepare_new_create_table_statement {
++prepare_new_create_table_statement {
+ # possible problems: typename ( number , number ) may contain ","
+
+ schema=`echo ".schema '$table_name';" | $ksqlite "$database_name" | \
+@@ -79,7 +79,7 @@
+ IFS=" "
+ }
+
+-function get_sql_column_names {
++get_sql_column_names {
+ names=`$ksqlite_header "$temp_db" "SELECT * FROM '$temp_table_name' LIMIT 1;" | \
+ head -n 1 || exit_with_error`
+ IFS="|"
+--- koffice-1.6.3.orig/kexi/tools/delete_column/kexi_delete_column_gui
++++ koffice-1.6.3/kexi/tools/delete_column/kexi_delete_column_gui
+@@ -20,7 +20,7 @@
+
+ basedir=`dirname "$0"`
+
+-function setup_messages {
++setup_messages {
+ lang=`grep Language= ~/.kde/share/config/kdeglobals | head -n 1 | \
+ sed -e 's/Language=\(.*\):.*/\1/'`
+ if [ -z "$lang" ] ; then lang="en" ; fi
More information about the pkg-kde-commits
mailing list