[qgis] 08/13: Add patch to disable features on ARM.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit 62892b59d42dea460d9947832465e702363ae1cf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 8 17:25:30 2014 +0100

    Add patch to disable features on ARM.
---
 debian/changelog                             |  2 +
 debian/patches/disable-features-on-arm.patch | 67 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 70 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 424ee06..6ce7ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ qgis (2.0.1-2) UNRELEASED; urgency=low
   * Add patch to not look for topology layers without topology support.
   * Add patch to fix postgis topology availability detection query.
   * Use dh --parallel instead of make flags.
+  * Add patch to disable features on ARM.
+    (closes: 737814)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 31 Jan 2014 19:42:03 +0100
 
diff --git a/debian/patches/disable-features-on-arm.patch b/debian/patches/disable-features-on-arm.patch
new file mode 100644
index 0000000..26c7e40
--- /dev/null
+++ b/debian/patches/disable-features-on-arm.patch
@@ -0,0 +1,67 @@
+Description: Disable troublesome features on ARM.
+ Building QGIS on ARM produces the error:
+ .
+ sip: qgis/python/core/qgsclipper.sip:44: \
+ QgsClipper::trimFeature() unsupported function argument type - provide %MethodCode and a C++ signature
+ .
+ In the upstream git repository this and other functions are disbled for
+ Android builds which have the same problems:
+ .
+ https://github.com/qgis/QGIS/commit/2cc684793ceb29d8600d71564fb38f92c998f588
+ .
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Bug-Debian: http://bugs.debian.org/737814
+
+--- a/python/core/qgsclipper.sip
++++ b/python/core/qgsclipper.sip
+@@ -1,3 +1,5 @@
++%Feature ARM
++
+ class QgsClipper
+ {
+ %TypeHeaderCode
+@@ -34,6 +36,7 @@ class QgsClipper
+     // A handy way to refer to the four boundaries
+     enum Boundary {XMax, XMin, YMax, YMin};
+ 
++%If (!ARM)
+     // Trims the given feature to a rectangular box. Returns the trimmed
+     // feature in x and y. The shapeOpen parameter determines whether
+     // the function treats the points as a closed shape (polygon), or as
+@@ -41,7 +44,7 @@ class QgsClipper
+     static void trimFeature( QVector<double>& x,
+                              QVector<double>& y,
+                              bool shapeOpen );
+-
++%End
+     static void trimPolygon( QPolygonF& pts, const QgsRectangle& clipRect );
+ 
+     /**Reads a polyline from WKB and clips it to clipExtent
+--- a/python/core/composer/qgscomposerscalebar.sip
++++ b/python/core/composer/qgscomposerscalebar.sip
+@@ -104,9 +104,11 @@ class QgsComposerScaleBar: QgsComposerIt
+     /**Returns style name*/
+     QString style() const;
+ 
++%If (!ARM)
+     /**Returns the x - positions of the segment borders (in item coordinates) and the width
+      of the segment*/
+     void segmentPositions( QList<QPair<double, double> >& posWidthList ) const;
++%End
+ 
+     /**Sets box size suitable to content*/
+     void adjustBoxSize();
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -72,6 +72,11 @@ IF(PYQT4_VERSION_NUM LESS 264196)
+   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QLISTCONSTPTR_CONVERSION)
+ ENDIF(PYQT4_VERSION_NUM LESS 264196)
+ 
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
++ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
++  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
++ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
++
+ # core module
+ FILE(GLOB_RECURSE sip_files_core core/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
diff --git a/debian/patches/series b/debian/patches/series
index 82af183..76402ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@ fix-qreal-vs-double.patch
 mis-detection-of-PostGIS-table-type.patch
 postgres-provider-topology-support.patch
 fix-query-to-detect-postgis-topology-availability.patch
+disable-features-on-arm.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git