This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis.
commit 9dbc1931507a4e7058a67e6f0f3bc4ca45ad5296 Author: Bas Couwenberg <[email protected]> Date: Wed Feb 26 21:40:19 2014 +0100 Restore disable-features-on-arm.patch to initial approach. The SIP %If directive only supports OR, so %If(!ANDROID && !ARM) is not possible. The build failure on Android is most likely also ARM specific, and will build fine with Android on x86 CPUs. --- debian/patches/disable-features-on-arm.patch | 30 +++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/debian/patches/disable-features-on-arm.patch b/debian/patches/disable-features-on-arm.patch index b7ac018..9aee101 100644 --- a/debian/patches/disable-features-on-arm.patch +++ b/debian/patches/disable-features-on-arm.patch @@ -20,9 +20,37 @@ Bug-Debian: http://bugs.debian.org/737814 +IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") +ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ANDROID) ++ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM) +ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + IF(NOT WITH_TOUCH) SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH) ENDIF(NOT WITH_TOUCH) +--- a/python/core/composer/qgscomposerscalebar.sip ++++ b/python/core/composer/qgscomposerscalebar.sip +@@ -109,7 +109,7 @@ class QgsComposerScaleBar: QgsComposerIt + of the segment + @note python bindings not available on android + */ +-%If (!ANDROID) ++%If (!ARM) + void segmentPositions( QList<QPair<double, double> >& posWidthList ) const; + %End + +--- a/python/core/qgsclipper.sip ++++ b/python/core/qgsclipper.sip +@@ -1,3 +1,5 @@ ++%Feature ARM ++ + class QgsClipper + { + %TypeHeaderCode +@@ -34,7 +36,7 @@ class QgsClipper + // A handy way to refer to the four boundaries + enum Boundary {XMax, XMin, YMax, YMin}; + +-%If (!ANDROID) ++%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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
