[QGIS Commit] r13473 - in trunk/qgis: cmake debian python src/core/symbology-ng

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-13 04:58:55 -0400 (Thu, 13 May 2010)
New Revision: 13473

Modified:
   trunk/qgis/cmake/FindPyQt4.cmake
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control
   trunk/qgis/python/CMakeLists.txt
   trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
Log:
make PyQt4 detection work with CMake 2.6.0 as found in Debian lenny

Modified: trunk/qgis/cmake/FindPyQt4.cmake
===================================================================
--- trunk/qgis/cmake/FindPyQt4.cmake	2010-05-12 22:53:01 UTC (rev 13472)
+++ trunk/qgis/cmake/FindPyQt4.cmake	2010-05-13 08:58:55 UTC (rev 13473)
@@ -22,10 +22,10 @@
 #
 # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
 
-IF(EXISTS PYQT4_VERSION)
+IF(EXISTS PYQT4_VERSION_STR)
   # Already in cache, be silent
   SET(PYQT4_FOUND TRUE)
-ELSE(EXISTS PYQT4_VERSION)
+ELSE(EXISTS PYQT4_VERSION_STR)
 
   FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
 
@@ -50,4 +50,10 @@
     ENDIF(PYQT4_FIND_REQUIRED)
   ENDIF(PYQT4_FOUND)
 
-ENDIF(EXISTS PYQT4_VERSION)
+ENDIF(EXISTS PYQT4_VERSION_STR)
+
+STRING(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\.[0-9]*$" "\\1" PYQT4_MAJOR_VERSION ${PYQT4_VERSION_STR})
+STRING(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\.[0-9]*$" "\\1" PYQT4_MINOR_VERSION ${PYQT4_VERSION_STR})
+STRING(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" PYQT4_PATCH_VERSION ${PYQT4_VERSION_STR})
+MATH( EXPR PYQT4_NUM_VERSION "${PYQT4_MAJOR_VERSION}*10000 + ${PYQT4_MINOR_VERSION}*100 + ${PYQT4_PATCH_VERSION}")
+

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2010-05-12 22:53:01 UTC (rev 13472)
+++ trunk/qgis/debian/changelog	2010-05-13 08:58:55 UTC (rev 13473)
@@ -2,15 +2,15 @@
 
   * new development version after 1.5 branch
   * adapted Francesco Paolo Lovergine's updates to Debian qgis 1.4 package
-  * require CMake >2.6 and Qt 4.4 for sid
+  * require CMake >2.6 and Qt 4.4
   * remove circular dependencies
   * integrate new GRASS raster provider and remove dependency to
     libgdal1-$VERSION-grass
   * add spatialquery plugin
   * include qgis.g.browser in grass plugin
-  * drop symbol tracking, C++ ABIs change too frequently 
+  * drop symbol tracking as C++ ABIs change too frequently
 
- -- Jürgen E. Fischer <jef at norbit.de>  Sat, 08 May 2010 13:26:13 +0200
+ -- Jürgen E. Fischer <jef at norbit.de>  Thu, 13 May 2010 10:54:06 +0200
 
 qgis (1.4.0) UNRELEASED; urgency=low
 

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2010-05-12 22:53:01 UTC (rev 13472)
+++ trunk/qgis/debian/control	2010-05-13 08:58:55 UTC (rev 13473)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev, 
  flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sharutils, sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-05-12 22:53:01 UTC (rev 13472)
+++ trunk/qgis/python/CMakeLists.txt	2010-05-13 08:58:55 UTC (rev 13473)
@@ -35,9 +35,9 @@
   ADD_DEFINITIONS(-DNOMINMAX)
 ENDIF(MSVC)
 
-IF(${PYQT4_VERSION_STR} VERSION_LESS "4.6.0")
+IF(${PYQT4_NUM_VERSION} LESS 40600)
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
-ENDIF(${PYQT4_VERSION_STR} VERSION_LESS "4.6.0")
+ENDIF(${PYQT4_NUM_VERSION} LESS 40600)
 
 # core module
 FILE(GLOB sip_files_core core/*.sip)

Modified: trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-05-12 22:53:01 UTC (rev 13472)
+++ trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-05-13 08:58:55 UTC (rev 13473)
@@ -342,7 +342,7 @@
   {
     QMatrix transform;
 
-    bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation;
+    // bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation;
     bool hasDataDefinedSize = context.renderHints() & QgsSymbolV2::DataDefinedSizeScale;
 
     // move to the desired position