Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (045714ede01d30d458d39db35f205cc49179d77b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (045714ede01d30d458d39db35f205cc49179d77b)
  • Date: Wed, 18 Feb 2009 07:30:53 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

kde-apps/koffice/HISTORY | 3
kde-apps/koffice/PRE_BUILD | 3
kde-apps/koffice/koffice-1.6.3-gcc-4.3.patch | 165
+++++++++++++++++++++++++++
video/kino/DETAILS | 4
video/kino/HISTORY | 3
5 files changed, 175 insertions(+), 3 deletions(-)

New commits:
commit 345523a15f4c87bcc6f133eba721f4a7bde3c64f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

kino: bump to 1.3.3

commit f345e55651f98961ff993cb06893c07ff0b3cbc1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

koffice: fix build with gcc-4.3

diff --git a/kde-apps/koffice/HISTORY b/kde-apps/koffice/HISTORY
index 2434c36..3fe406c 100644
--- a/kde-apps/koffice/HISTORY
+++ b/kde-apps/koffice/HISTORY
@@ -1,3 +1,6 @@
+2009-02-18 Thomas Orgis <sobukus AT sourcemakge.org>
+ * PRE_BUILD, koffice-1.6.3-gcc-4.3.patch: fix build with current gcc
+
2008-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: rmeove unneeded kdebase

diff --git a/kde-apps/koffice/PRE_BUILD b/kde-apps/koffice/PRE_BUILD
index 281e688..6df5b6d 100755
--- a/kde-apps/koffice/PRE_BUILD
+++ b/kde-apps/koffice/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff &&
bzcat $SPELL_DIRECTORY/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2|
\
- patch -p0
+ patch -p0 &&
+patch -Np1 < "$SCRIPT_DIRECTORY/koffice-1.6.3-gcc-4.3.patch"
diff --git a/kde-apps/koffice/koffice-1.6.3-gcc-4.3.patch
b/kde-apps/koffice/koffice-1.6.3-gcc-4.3.patch
new file mode 100644
index 0000000..36b718d
--- /dev/null
+++ b/kde-apps/koffice/koffice-1.6.3-gcc-4.3.patch
@@ -0,0 +1,165 @@
+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".
+
+--- koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp~ 2007-05-30
23:35:49.000000000 +0200
++++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2008-07-31
23:33:53.128971589 +0200
+@@ -27,6 +27,8 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+
++#include <stdlib.h>
++
+ using namespace KexiDB;
+
+
+--- koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx~
2007-05-30 23:39:02.000000000 +0200
++++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx
2008-08-01 00:13:43.372064696 +0200
+@@ -27,6 +27,7 @@
+ /* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
++#include <string.h>
+ #include <math.h>
+ #include "FilterInternal.hxx"
+ #include "TableStyle.hxx"
+--- koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx~
2007-05-30 23:39:02.000000000 +0200
++++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx
2008-08-01 00:25:21.368662495 +0200
+@@ -28,6 +28,9 @@
+ /* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
++
++#include <string.h>
++
+ #include "FilterInternal.hxx"
+ #include "TextRunStyle.hxx"
+ #include "WriterProperties.hxx"
+--- koffice-1.6.3/filters/kpresenter/powerpoint/libppt/pole.cpp~
2007-05-30 23:38:58.000000000 +0200
++++ koffice-1.6.3/filters/kpresenter/powerpoint/libppt/pole.cpp
2008-08-01 00:39:33.888577648 +0200
+@@ -26,6 +26,8 @@
+ THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <string.h>
++
+ #include <fstream>
+ #include <iostream>
+ #include <list>
diff --git a/video/kino/DETAILS b/video/kino/DETAILS
index 1b3b87a..a41c9f0 100755
--- a/video/kino/DETAILS
+++ b/video/kino/DETAILS
@@ -1,6 +1,6 @@
SPELL=kino
- VERSION=1.3.1
-
SOURCE_HASH=sha512:35389e2569c41dd6cae43f6739c84642d7365eadc3dd69fd04c8b96e0e65c0d33437369c986ad83faa789c5049e520cc67c5d8f90344497fa6bbf45833b2a358
+ VERSION=1.3.3
+
SOURCE_HASH=sha512:39e4d7eadeefda4ca3f1026d6972c6735d829d0581ad38c3f64059362d10467e31d5e5864da6c48ad7e628496d70c0d94a56ac245e1e2463ff0b55e0d704d307
SOURCE=${SPELL}-${VERSION}.tar.gz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/video/kino/HISTORY b/video/kino/HISTORY
index 85ea753..a37c355 100644
--- a/video/kino/HISTORY
+++ b/video/kino/HISTORY
@@ -1,3 +1,6 @@
+2009-02-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.3.3
+
2008-08-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.1
* DEPENDS: change option for udev



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (045714ede01d30d458d39db35f205cc49179d77b), Thomas Orgis, 02/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page