Adjust qtlocation patch for alpha release

Change-Id: Ibb82c0f9e3f5bed7e297cec550bc06049adeabf2

3 files changed, 36 insertions, 40 deletions

diff --git a/0001-Fix-qreal-double-mingling.patch b/0001-Fix-qreal-double-mingling.patch
new file mode 100644
index 000000000000..38f953e637c1
--- /dev/null
+++ b/0001-Fix-qreal-double-mingling.patch
@@ -0,0 +1,35 @@
+From 6d2f3b5f871426ebc68f487b1572e4c9eb9abb0e Mon Sep 17 00:00:00 2001
+From: Donald Carr <sirspudd@gmail.com>
+Date: Wed, 23 Mar 2016 14:59:45 -0700
+Subject: [PATCH] Fix qreal/double mingling
+
+Change-Id: I3ad1dc194ef1fcb836273a2f7e581109c80f11a0
+---
+ src/imports/location/qdeclarativegeomap.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
+index 591bcd7..dd4eebc 100644
+--- a/src/imports/location/qdeclarativegeomap.cpp
++++ b/src/imports/location/qdeclarativegeomap.cpp
+@@ -572,7 +572,7 @@ void QDeclarativeGeoMap::setMinimumZoomLevel(qreal minimumZoomLevel)
+     if (m_gestureArea && minimumZoomLevel >= 0) {
+         qreal oldMinimumZoomLevel = this->minimumZoomLevel();
+         if (m_mappingManagerInitialized) {
+-            minimumZoomLevel = qBound(m_map->minimumZoom(),minimumZoomLevel,m_mappingManager->cameraCapabilities().maximumZoomLevel());
++            minimumZoomLevel = qBound(qreal(m_map->minimumZoom()),minimumZoomLevel,qreal(m_mappingManager->cameraCapabilities().maximumZoomLevel()));
+         }
+ 
+         m_gestureArea->setMinimumZoomLevel(minimumZoomLevel);
+@@ -619,7 +619,7 @@ void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel)
+     if (m_gestureArea && maximumZoomLevel >= 0) {
+         qreal oldMaximumZoomLevel = this->maximumZoomLevel();
+         if (m_mappingManagerInitialized) {
+-            maximumZoomLevel = qBound(m_map->minimumZoom(),maximumZoomLevel,m_mappingManager->cameraCapabilities().maximumZoomLevel());
++            maximumZoomLevel = qBound(qreal(m_map->minimumZoom()),maximumZoomLevel,qreal(m_mappingManager->cameraCapabilities().maximumZoomLevel()));
+         }
+ 
+         m_gestureArea->setMaximumZoomLevel(maximumZoomLevel);
+-- 
+2.7.4
+
diff --git a/0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch b/0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch
deleted file mode 100644
index 3aea67776eaf..000000000000
--- a/0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 63b951ffdd582c6e10466e4dc4809b331860992e Mon Sep 17 00:00:00 2001
-From: Donald Carr <sirspudd@gmail.com>
-Date: Wed, 23 Mar 2016 14:25:31 -0700
-Subject: [PATCH] Remove inconsistent qreal/double co-mingling/comparison
-
-Fixes build breakage on machines where qreal = float (many ARM devices).
-Avoid needless float to double conversion before assignment back to a
-float.
-
-Change-Id: Ia11c9dc912361f5aa05c4e01dec45c0d7b477609
----
- src/imports/location/qdeclarativegeomap.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
-index b39f38c..c72e566 100644
---- a/src/imports/location/qdeclarativegeomap.cpp
-+++ b/src/imports/location/qdeclarativegeomap.cpp
-@@ -586,7 +586,7 @@ void QDeclarativeGeoMap::setMinimumZoomLevel(qreal minimumZoomLevel)
-         qreal oldMinimumZoomLevel = this->minimumZoomLevel();
- 
-         if (m_map) {
--            minimumZoomLevel = qBound(m_map->cameraCapabilities().minimumZoomLevel(), minimumZoomLevel, maximumZoomLevel());
-+            minimumZoomLevel = qBound(qreal(m_map->cameraCapabilities().minimumZoomLevel()), minimumZoomLevel, maximumZoomLevel());
-             double minimumViewportZoomLevel = m_map->minimumZoomForMapSize(width(),height());
-             if (minimumZoomLevel < minimumViewportZoomLevel)
-                 minimumZoomLevel = minimumViewportZoomLevel;
-@@ -637,7 +637,7 @@ void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel)
-         qreal oldMaximumZoomLevel = this->maximumZoomLevel();
- 
-         if (m_map)
--            maximumZoomLevel = qBound(minimumZoomLevel(), double(maximumZoomLevel), m_map->cameraCapabilities().maximumZoomLevel());
-+            maximumZoomLevel = qBound(minimumZoomLevel(), maximumZoomLevel, qreal(m_map->cameraCapabilities().maximumZoomLevel()));
- 
-         m_gestureArea->setMaximumZoomLevel(maximumZoomLevel);
- 
--- 
-2.7.4
-
diff --git a/PKGBUILD b/PKGBUILD
index 2de729476f64..e817ec82a8c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -163,7 +163,7 @@ fi
   patch -p1 < ${_patch_dir}/0001-Include-neon-support-for-any-fpu-.-neon.patch
   patch -p1 < ${_patch_dir}/0001-Always-define-arm_thumb.patch
   cd ${_locationdir}
-  patch -p1 < ${_patch_dir}/0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch
+  patch -p1 < ${_patch_dir}/0001-Fix-qreal-double-mingling.patch
 
   # end patch