rpms/koffice/devel koffice-kexi.patch, NONE, 1.1 koffice.spec, 1.19, 1.20

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	koffice.spec 
Added Files:
	koffice-kexi.patch 
Log Message:
- add kexi compile fixes


koffice-kexi.patch:

--- NEW FILE koffice-kexi.patch ---
--- branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.h	2005/10/18 15:34:45	471722
@@ -60,7 +60,7 @@
 			~MySQLMigrate();
 			//Constructor
 			MySQLMigrate();
-			MySQLMigrate::MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
+			MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
 			
 			KexiDB::Field::Type type(const QString& table, const MYSQL_FIELD* t);
 			
@@ -69,8 +69,8 @@
 			
 			QStringList examineEnumField(const QString& table,
 			                             const MYSQL_FIELD* fld);
-			void MySQLMigrate::getConstraints(int mysqlConstraints, KexiDB::Field* fld);
-			void MySQLMigrate::getOptions(int flags, KexiDB::Field* fld);
+			void getConstraints(int mysqlConstraints, KexiDB::Field* fld);
+			void getOptions(int flags, KexiDB::Field* fld);
 
 		/*! driver's static version information, it is automatically implemented
 		 in implementation using KEXIDB_DRIVER macro (see driver_p.h) */


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- koffice.spec	15 Dec 2005 09:05:08 -0000	1.19
+++ koffice.spec	15 Dec 2005 10:16:31 -0000	1.20
@@ -18,6 +18,7 @@
 Patch100:       koffice-krita-kisfilter.patch
 Patch101:       koffice-krita-kisclipboard.patch
 Patch102:       koffice-kspread.patch
+Patch103:       koffice-kexi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -201,6 +202,7 @@
 %patch100
 %patch101 -p4
 %patch102 -p4
+%patch103 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -757,8 +759,10 @@
 * Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fixes
-- add kspread compile fixes
+- gcc 4.1.0:
+    - add krita compile fixes
+    - add kspread compile fixes
+    - add kexi compile fixes
 
 * Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-2