[arch-commits] Commit in koffice/repos (7 files)

Ronald van Haren ronald at archlinux.org
Thu May 28 11:30:49 EDT 2009


    Date: Thursday, May 28, 2009 @ 11:30:49
  Author: ronald
Revision: 40137

Merged revisions 40125-40126,40136 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/koffice/trunk

........
  r40125 | ronald | 2009-05-28 15:28:37 +0200 (Thu, 28 May 2009) | 1 line
  
  remove old patches
........
  r40126 | ronald | 2009-05-28 15:29:18 +0200 (Thu, 28 May 2009) | 1 line
  
  remove old patch
........
  r40136 | ronald | 2009-05-28 17:30:16 +0200 (Thu, 28 May 2009) | 1 line
  
  upgpkg: koffice 2.0.0-1
........

Modified:
  koffice/repos/extra-x86_64/	(properties)
  koffice/repos/extra-x86_64/PKGBUILD
Deleted:
  koffice/repos/extra-x86_64/kexi-examples-build.patch
  koffice/repos/extra-x86_64/kis_filter_registry.patch
  koffice/repos/extra-x86_64/koffice-1.5.1-kexi-checkbox-data-saving.patch
  koffice/repos/extra-x86_64/koffice-1.5.1-kexi-form-plugins.patch
  koffice/repos/extra-x86_64/koffice-1.6.3-gcc43.patch

-----------------------------------------------+
 PKGBUILD                                      |    9 -
 kexi-examples-build.patch                     |   11 -
 kis_filter_registry.patch                     |   10 -
 koffice-1.5.1-kexi-checkbox-data-saving.patch |   65 ----------
 koffice-1.5.1-kexi-form-plugins.patch         |   52 --------
 koffice-1.6.3-gcc43.patch                     |  153 ------------------------
 6 files changed, 5 insertions(+), 295 deletions(-)


Property changes on: koffice/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /koffice/trunk:1-32934
   + /koffice/trunk:1-40136

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-28 15:30:16 UTC (rev 40136)
+++ extra-x86_64/PKGBUILD	2009-05-28 15:30:49 UTC (rev 40137)
@@ -1,9 +1,8 @@
 # $Id$
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=koffice
-pkgver=1.9.99.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="A free, integrated office suite for KDE, the K Desktop Environment"
 arch=('i686' 'x86_64')
@@ -15,8 +14,8 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen')
 options=('!docs')
 install='koffice.install'
-source=("http://download.kde.org/unstable/koffice-${pkgver}/src/koffice-${pkgver}.tar.bz2")
-md5sums=('46dcbdda79c6a9aa645d1d473c8d2046')
+source=("http://download.kde.org/stable/koffice-${pkgver}/src/koffice-${pkgver}.tar.bz2")
+md5sums=('46531c940d4672f5206cd60bb484f1c6')
 
 build() {
 	cd ${srcdir}
@@ -24,6 +23,8 @@
 	cd build
 	cmake ../koffice-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make || return 1
 	make DESTDIR=${pkgdir} install

Deleted: extra-x86_64/kexi-examples-build.patch
===================================================================
--- extra-x86_64/kexi-examples-build.patch	2009-05-28 15:30:16 UTC (rev 40136)
+++ extra-x86_64/kexi-examples-build.patch	2009-05-28 15:30:49 UTC (rev 40137)
@@ -1,11 +0,0 @@
---- koffice-1.6.2/kexi/examples/build_kexi_file.sh.orig	2007-03-06 03:30:23.000000000 +0000
-+++ koffice-1.6.2/kexi/examples/build_kexi_file.sh	2007-03-06 03:31:56.000000000 +0000
-@@ -9,7 +9,7 @@
- 
- KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
- PATH=$PATH:$KEXISQL3PATH
--LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
-+export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
- which ksqlite > /dev/null || exit 1
- 
- [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1

Deleted: extra-x86_64/kis_filter_registry.patch
===================================================================
--- extra-x86_64/kis_filter_registry.patch	2009-05-28 15:30:16 UTC (rev 40136)
+++ extra-x86_64/kis_filter_registry.patch	2009-05-28 15:30:49 UTC (rev 40137)
@@ -1,10 +0,0 @@
---- koffice-1.4.2/krita/core/kis_filter_registry.h.orig	2006-01-19 18:43:21.000000000 +0100
-+++ koffice-1.4.2/krita/core/kis_filter_registry.h	2006-01-19 18:43:34.000000000 +0100
-@@ -26,7 +26,6 @@
- #include "kis_types.h"
- #include "kis_generic_registry.h"
- #include "kaction.h"
--#include "kis_filter.h"
- 
- class QString;
- class KisView;

Deleted: extra-x86_64/koffice-1.5.1-kexi-checkbox-data-saving.patch
===================================================================
--- extra-x86_64/koffice-1.5.1-kexi-checkbox-data-saving.patch	2009-05-28 15:30:16 UTC (rev 40136)
+++ extra-x86_64/koffice-1.5.1-kexi-checkbox-data-saving.patch	2009-05-28 15:30:49 UTC (rev 40137)
@@ -1,65 +0,0 @@
-Index: kexi/plugins/forms/kexidataprovider.cpp
-===================================================================
---- kexi/plugins/forms/kexidataprovider.cpp	(revision 542130)
-+++ kexi/plugins/forms/kexidataprovider.cpp	(revision 542131)
-@@ -92,7 +92,8 @@
-  	for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); 
- 		it!=m_fieldNumbersForDataItems.constEnd(); ++it)
- 	{
--		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() << endl;
-+		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() 
-+			<< " data=" << row.at(it.data()) << endl;
- 		it.key()->setValue( row.at(it.data()) );
- 	}
- }
-Index: kexi/plugins/forms/widgets/kexidbautofield.cpp
-===================================================================
---- kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542130)
-+++ kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542131)
-@@ -446,8 +446,11 @@
- 		@todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool]
- 		(see doc/dev/settings.txt) */
- 			if (!text.isEmpty()) {
--				realText = text[0].upper();
--				realText += (text.mid(1) + ": ");
-+				realText = text[0].upper() + text.mid(1);
-+				if (m_widgetType!=Boolean) {
-+//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
-+					realText += ": ";
-+				}
- 			}
- 		}
- 		else
-Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp
-===================================================================
---- kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542130)
-+++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542131)
-@@ -27,7 +27,9 @@
-  : QCheckBox(text, parent, name), KexiFormDataItemInterface()
- {
- 	m_invalidState = false;
-+//! todo: tristate 
- 	setTristate(true);
-+	setFocusPolicy(QWidget::StrongFocus);
- 	connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int)));
- }
- 
-@@ -56,13 +58,16 @@
- 
- void KexiDBCheckBox::setValueInternal(const QVariant &add, bool )
- {
--	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
-+//	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
-+	setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) );
- }
- 
- QVariant
- KexiDBCheckBox::value()
- {
--	return QVariant( isChecked(), 3 );
-+	if (state()==NoChange)
-+		return QVariant();
-+	return QVariant(state()==On, 1);
- }
- 
- void KexiDBCheckBox::slotStateChanged(int )

Deleted: extra-x86_64/koffice-1.5.1-kexi-form-plugins.patch
===================================================================
--- extra-x86_64/koffice-1.5.1-kexi-form-plugins.patch	2009-05-28 15:30:16 UTC (rev 40136)
+++ extra-x86_64/koffice-1.5.1-kexi-form-plugins.patch	2009-05-28 15:30:49 UTC (rev 40137)
@@ -1,52 +0,0 @@
---- kexi/plugins/forms/Makefile.am.orig
-+++ kexi/plugins/forms/Makefile.am
-@@ -23,9 +23,10 @@
- 	kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
- 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
- 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
--libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
- libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
- 	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
- 
- kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
---- kexi/plugins/reports/Makefile.am.orig
-+++ kexi/plugins/reports/Makefile.am
-@@ -5,24 +5,29 @@
- kexihandler_report_la_SOURCES = kexireports.cpp
- kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
- kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
--  ../../widget/utils/libkexiguiutils.la \
--  ../../widget/libkexiextendedwidgets.la \
--  ../../formeditor/libkformdesigner.la \
--  ../forms/libkexiformutils.la \
-+  $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
-+  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+  $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
-   ./libkexireportutils.la
- 
- kexireportwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
- kexireportwidgets_la_SOURCES =   reportwidgets.cpp kexireportfactory.cpp
- kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
-+	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
-+	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- 	./libkexireportutils.la
- 
- lib_LTLIBRARIES = libkexireportutils.la
- libkexireportutils_la_SOURCES = \
- 	kexireportpart.cpp kexireportview.cpp kexireportform.cpp
--libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
- libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
-+	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
--	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
-+	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la
- 
- kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
- kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop

Deleted: extra-x86_64/koffice-1.6.3-gcc43.patch
===================================================================
--- extra-x86_64/koffice-1.6.3-gcc43.patch	2009-05-28 15:30:16 UTC (rev 40136)
+++ extra-x86_64/koffice-1.6.3-gcc43.patch	2009-05-28 15:30:49 UTC (rev 40137)
@@ -1,153 +0,0 @@
-diff -Naur koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx
---- koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx	2008-04-12 21:18:16.000000000 -0400
-+++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx	2008-04-12 21:25:04.000000000 -0400
-@@ -28,6 +28,7 @@
-  * Corel Corporation or Corel Corporation Limited."
-  */
- #include <math.h>
-+#include <cstring>
- #include "FilterInternal.hxx"
- #include "TableStyle.hxx"
- #include "DocumentElement.hxx"
-diff -Naur koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx
---- koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx	2008-04-12 21:18:16.000000000 -0400
-+++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx	2008-04-12 21:24:42.000000000 -0400
-@@ -28,6 +28,7 @@
- /* "This product is not manufactured, approved, or supported by
-  * Corel Corporation or Corel Corporation Limited."
-  */
-+#include <cstring>
- #include "FilterInternal.hxx"
- #include "TextRunStyle.hxx"
- #include "WriterProperties.hxx"
-diff -Naur koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
---- koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2008-04-12 21:18:16.000000000 -0400
-+++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2008-04-12 21:24:04.000000000 -0400
-@@ -26,6 +26,7 @@
- 
- #include <klocale.h>
- #include <kdebug.h>
-+#include <cstdlib>
- 
- using namespace KexiDB;
- 
-diff -Naur koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp koffice-1.6.3/krita/core/kis_perspective_math.cpp
---- koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp	2008-04-12 21:18:16.000000000 -0400
-+++ koffice-1.6.3/krita/core/kis_perspective_math.cpp	2008-04-12 21:20:27.000000000 -0400
-@@ -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 -Naur koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
---- koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2008-04-12 21:18:17.000000000 -0400
-+++ koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2008-04-12 21:22:45.000000000 -0400
-@@ -174,12 +174,8 @@
- 	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 +185,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-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h
---- koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h	2008-04-12 21:18:17.000000000 -0400
-+++ koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h	2008-04-12 21:22:55.000000000 -0400
-@@ -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".



More information about the arch-commits mailing list