Apply patches given in ticket #313

git-svn-id: http://svn.osgeo.org/qgis/trunk@5887 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 30, 2006 · 358800d · 358800d
1 parent f7117cb
commit 358800d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/configure.in b/configure.in
@@ -452,6 +452,7 @@ AC_SUBST(DEBUG_QGIS)
 AC_CONFIG_FILES([
   Makefile 
   Makefile.win.rules 
+  create_qm_files.sh
   doc/Makefile
   doc/images/Makefile
   doc/install_guide/Makefile

diff --git a/create_qm_files.sh → create_qm_files.sh.in b/create_qm_files.sh → create_qm_files.sh.in
@@ -9,8 +9,8 @@
 # create_qm_files.sh,v 1.4 2004/07/14 18:16:00 gsherman Exp
 echo Creating qmake project file
 # force the output name to be qgis_qm.pro
-qmake -project -o qgis_qm.pro
+@QTDIR@/bin/qmake -project -o qgis_qm.pro
 echo Creating qm files
-lrelease -verbose qgis_qm.pro
+@QTDIR@/bin/lrelease -verbose qgis_qm.pro
 echo Removing qmake project file
 rm qgis_qm.pro
diff --git a/src/plugins/grass/qgsgrassshell.cpp b/src/plugins/grass/qgsgrassshell.cpp
@@ -40,8 +40,12 @@ extern "C" {
 #ifdef Q_OS_MACX
 #include <util.h>
 #else
+#ifdef __NetBSD__
+#include <util.h>
+#else
 #include <pty.h>
 #endif
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -18,6 +18,10 @@
 
 /* $Id$ */
 
+#define _GLIBCPP_USE_C99 1
+#include <cmath>
+#undef _GLIBCPP_USE_C99
+
 #include "qgslogger.h"
 #include "qgswmsprovider.h"
 
@@ -29,7 +33,6 @@
 
 #include "qgshttptransaction.h"
 
-#include <cmath>
 #include <q3url.h>
 #include <Q3Picture>
 
@@ -1948,8 +1951,13 @@ bool QgsWmsProvider::calculateExtent()
       }
 
     //make sure extent does not contain 'inf' or 'nan'
+#if __GNUC__ >= 4
+    if(!isfinite(extent.xMin()) || !isfinite((int)extent.yMin()) || !isfinite(extent.xMax()) || \
+       !isfinite((int)extent.yMax()))
+#else
     if(!std::isfinite(extent.xMin()) || !std::isfinite((int)extent.yMin()) || !std::isfinite(extent.xMax()) || \
        !std::isfinite((int)extent.yMax()))
+#endif
       {
 	continue;
       }