dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

- fix build by adding more gcc43 patches

Browse Source 
- rebuild against grass63
This commit is contained in:
Douglas E. Warner 2008-03-28 17:10:46 +00:00
parent 7f9b3945a6
commit d1016f46d7
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gcc43-qgis-0.9.1.patch Normal file
View File

@ -0,0 +1,53 @@
--- 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>

8
qgis.spec
View File

@ -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 @@ Patch1: gcc43-INT_MAX-qgis-0.9.1.patch
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 @@ Addtional theme for qgis - nkids
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p0
%build
@ -215,6 +217,10 @@ desktop-file-install --vendor="fedora" \
%changelog
* Fri Mar 28 2008 Balint Cristian <rezso@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@fedoraproject.org> - 0.9.1-4
- Autorebuild for GCC 4.3