diff options
author | Donald Carr | 2016-03-23 14:42:56 -0700 |
---|---|---|
committer | Donald Carr | 2016-03-23 14:42:56 -0700 |
commit | 3c3379a67c665e7f4711ff76a854de0244d1cef3 (patch) | |
tree | 03b46387b89f490d2aadc63a348f999e378170d0 | |
parent | c072ec66e540f0e735b8899938bef82babfb2903 (diff) | |
download | aur-3c3379a67c665e7f4711ff76a854de0244d1cef3.tar.gz |
Introduce qtlocation patch
Change-Id: If73dd4a7c52275381c490165e28add4f6e42ad10
-rw-r--r-- | 0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch | 39 | ||||
-rw-r--r-- | PKGBUILD | 5 |
2 files changed, 43 insertions, 1 deletions
diff --git a/0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch b/0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch new file mode 100644 index 000000000000..3aea67776eaf --- /dev/null +++ b/0001-Remove-inconsistent-qreal-double-co-mingling-compari.patch @@ -0,0 +1,39 @@ +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 + @@ -26,7 +26,7 @@ _local_qt5_repo="/opt/dev/src/qtproject/qt5" # PKGBUILD pkgrel=3 -_piver=2 +_piver=3 _pkgvermajmin="5.7" pkgver="${_pkgvermajmin}.0" @@ -117,6 +117,7 @@ build() { local _basedir="${_srcdir}/qtbase" local _waylanddir="${_srcdir}/qtwayland" local _webenginedir="${_srcdir}/qtwebengine" + local _locationdir="${_srcdir}/qtlocation" local _bindir="${_srcdir}" local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}" @@ -164,6 +165,8 @@ fi cd ${_webenginedir} 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 # end patch |