diff --git a/gcc43-duplicate_function_param-qgis-0.9.1.patch b/gcc43-duplicate_function_param-qgis-0.9.1.patch new file mode 100644 index 0000000..8b31532 --- /dev/null +++ b/gcc43-duplicate_function_param-qgis-0.9.1.patch @@ -0,0 +1,17 @@ +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); + } + diff --git a/qgis.spec b/qgis.spec index 811010f..400effd 100644 --- a/qgis.spec +++ b/qgis.spec @@ -13,6 +13,7 @@ Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz 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 @@ Addtional theme for qgis - nkids %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -211,6 +213,7 @@ desktop-file-install --vendor="fedora" \ %changelog * Mon Feb 18 2008 Douglas E. Warner 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 0.9.1-3 - adding Requires sip, PyQt4 for python bindings support