rpms/qgis/devel gcc43-qgis-0.9.1.patch, NONE, 1.1 qgis.spec, 1.19, 1.20

[Douglas E. Warner (silfreed)]

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21274

Modified Files:
	qgis.spec 
Added Files:
	gcc43-qgis-0.9.1.patch 
Log Message:
* Fri Mar 28 2008 Balint Cristian <rezso at rdsor.ro> - 0.9.1-5
- fix build by adding more gcc43 patches
- rebuild against grass63


gcc43-qgis-0.9.1.patch:

--- NEW FILE gcc43-qgis-0.9.1.patch ---
--- src/providers/gpx/gpsdata.cpp.orig	2007-02-01 17:44:20.000000000 +0200
+++ src/providers/gpx/gpsdata.cpp	2008-03-28 18:04:58.000000000 +0200
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <cstring>
 #include <limits>
 #include <stdexcept>
 
--- src/providers/postgres/qgspostgisbox3d.cpp.orig	2008-03-28 18:12:21.000000000 +0200
+++ src/providers/postgres/qgspostgisbox3d.cpp	2008-03-28 18:14:11.000000000 +0200
@@ -17,6 +17,8 @@
  ***************************************************************************/
 /* $Id: qgspostgisbox3d.cpp 6415 2007-01-09 02:39:15Z wonder $ */
 
+#include <stdlib.h>
+
 #include <fstream>
 
 #include <QString>
--- src/plugins/grass/qgsgrassmapcalc.cpp.orig	2008-03-28 18:19:45.000000000 +0200
+++ src/plugins/grass/qgsgrassmapcalc.cpp	2008-03-28 18:20:01.000000000 +0200
@@ -13,6 +13,7 @@
  *                                                                       *
  *************************************************************************/
 #include <iostream>
+#include <typeinfo>
 
 #include <qapplication.h>
 #include <qstringlist.h>
--- src/app/composer/qgscomposition.cpp.orig	2008-03-28 18:27:35.000000000 +0200
+++ src/app/composer/qgscomposition.cpp	2008-03-28 18:27:55.000000000 +0200
@@ -13,6 +13,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include <typeinfo>
+
 #include "qgscomposition.h"
 
 #include "qgscomposer.h"
--- src/plugins/grass/qgsgrassmodule.cpp.orig	2008-03-28 18:54:29.000000000 +0200
+++ src/plugins/grass/qgsgrassmodule.cpp	2008-03-28 18:54:55.000000000 +0200
@@ -13,6 +13,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include <typeinfo>
+
 #include <q3cstring.h>
 #include <q3groupbox.h>
 #include <q3listbox.h>


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qgis.spec	20 Feb 2008 00:00:30 -0000	1.19
+++ qgis.spec	28 Mar 2008 17:10:46 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name: qgis
 Version: 0.9.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -16,6 +16,7 @@
 Patch2: gcc43-duplicate_function_param-qgis-0.9.1.patch
 Patch3: gcc43-memcpy-qgis-0.9.1.patch
 Patch4: gcc43-memcpy-strtod-qgis-0.9.1.patch
+Patch5: gcc43-qgis-0.9.1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: sip
@@ -89,6 +90,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 
 %build
@@ -215,6 +217,10 @@
 
 
 %changelog
+* Fri Mar 28 2008 Balint Cristian <rezso at rdsor.ro> - 0.9.1-5
+- fix build by adding more gcc43 patches
+- rebuild against grass63
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.1-4
 - Autorebuild for GCC 4.3