rpms/qgis/devel gcc43-duplicate_function_param-qgis-0.9.1.patch, NONE, 1.1 qgis.spec, 1.15, 1.16

[Douglas E. Warner (silfreed)]

Author: silfreed

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

Modified Files:
	qgis.spec 
Added Files:
	gcc43-duplicate_function_param-qgis-0.9.1.patch 
Log Message:
adding gcc43-duplicate_function_param-qgis-0.9.1.patch

gcc43-duplicate_function_param-qgis-0.9.1.patch:

--- NEW FILE gcc43-duplicate_function_param-qgis-0.9.1.patch ---
diff -ruN qgis-0.9.1/src/core/spatialindex/include/SpatialIndex.h qgis-0.9.1-new/src/core/spatialindex/include/SpatialIndex.h
--- qgis-0.9.1/src/core/spatialindex/include/SpatialIndex.h	2007-09-27 15:41:16.000000000 -0400
+++ qgis-0.9.1-new/src/core/spatialindex/include/SpatialIndex.h	2008-02-18 14:44:04.000000000 -0500
@@ -183,13 +183,7 @@
 		extern IStorageManager* createNewDiskStorageManager(std::string& baseName, unsigned long pageSize);
 		extern IStorageManager* loadDiskStorageManager(std::string& baseName);
 
-#ifdef _MSC_VER
-		// MSVC didn't like the difference in parameter names between declaration
-		// definition
 		extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& sm, Tools::PropertySet& ps);
-#else
-		extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& in, Tools::PropertySet& in);
-#endif//_MSC_VER
 		extern IBuffer* createNewRandomEvictionsBuffer(IStorageManager& in, unsigned int capacity, bool bWriteThrough);
 	}
 


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qgis.spec	18 Feb 2008 18:23:22 -0000	1.15
+++ qgis.spec	18 Feb 2008 19:46:42 -0000	1.16
@@ -13,6 +13,7 @@
 Source1: %{name}.desktop
 Patch0: python-site-packages-dir-0.9.1.patch
 Patch1: gcc43-INT_MAX-qgis-0.9.1.patch
+Patch2: gcc43-duplicate_function_param-qgis-0.9.1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: sip
@@ -83,6 +84,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -211,6 +213,7 @@
 %changelog
 * Mon Feb 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-4
 - adding gcc43-INT_MAX-qgis-0.9.1.patch
+- adding gcc43-duplicate_function_param-qgis-0.9.1.patch
 
 * Mon Feb 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-3
 - adding Requires sip, PyQt4 for python bindings support