[SCM] qtlocation packaging branch, kubuntu_unstable, updated. ubuntu/5.4.2-1ubuntu1-8-g8b493ef

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=4755dc7

The following commit has been merged in the kubuntu_unstable branch:
commit 4755dc7575fe07eac5b41f88c387d35f4e0c4c98
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 14 11:11:37 2015 +0000

    Add two patches.
---
 debian/patches/appSpecificTileCache.diff           | 22 ++++++++++++
 .../disable_qgeocircle_extendShape_tests.patch     | 41 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 65 insertions(+)

diff --git a/debian/patches/appSpecificTileCache.diff b/debian/patches/appSpecificTileCache.diff
new file mode 100644
index 0000000..47d23aa
--- /dev/null
+++ b/debian/patches/appSpecificTileCache.diff
@@ -0,0 +1,22 @@
+Description: Use app specific tile cache directory
+ Fix a problem in confined apps.
+ .
+Author: Christian Dywan <christian.dywan at canonical.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1276658
+Forwarded: https://bugreports.qt-project.org/browse/QTBUG-41187
+Last-Updated: 2014-09-09
+
+
+=== modified file 'src/location/maps/qgeotilecache.cpp'
+--- a/src/location/maps/qgeotilecache.cpp	2014-09-08 10:48:22 +0000
++++ b/src/location/maps/qgeotilecache.cpp	2014-09-08 10:51:56 +0000
+@@ -116,8 +116,7 @@
+     // of course override them)
+ 
+     if (directory_.isEmpty()) {
+-        directory_ = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)
+-                + QLatin1String("/QtLocation");
++        directory_ = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+         QDir::root().mkpath(directory_);
+     }
+ 
diff --git a/debian/patches/disable_qgeocircle_extendShape_tests.patch b/debian/patches/disable_qgeocircle_extendShape_tests.patch
new file mode 100644
index 0000000..4acd086
--- /dev/null
+++ b/debian/patches/disable_qgeocircle_extendShape_tests.patch
@@ -0,0 +1,41 @@
+Description: disable qgeocircle::extendShape* tests.
+ This tests fail on i386 most probably due to qFuzzyCompare() being used.
+ Filled https://bugreports.qt-project.org/browse/QTBUG-41447 for it.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Bug-Qt: https://bugreports.qt-project.org/browse/QTBUG-41447
+Forwarded: not-needed
+
+---
+ tests/auto/qgeocircle/tst_qgeocircle.cpp |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/tests/auto/qgeocircle/tst_qgeocircle.cpp
++++ b/tests/auto/qgeocircle/tst_qgeocircle.cpp
+@@ -73,8 +73,9 @@ private slots:
+     void contains_data();
+     void contains();
+ 
+-    void extendShape();
+-    void extendShape_data();
++    // Failing on i386, see https://bugreports.qt-project.org/browse/QTBUG-41447
++    //void extendShape();
++    //void extendShape_data();
+ 
+     void areaComparison();
+     void areaComparison_data();
+@@ -316,6 +317,7 @@ void tst_QGeoCircle::contains()
+     QCOMPARE(area.contains(probe), result);
+ }
+ 
++/*
+ void tst_QGeoCircle::extendShape()
+ {
+     QFETCH(QGeoCircle, circle);
+@@ -364,6 +366,7 @@ void tst_QGeoCircle::extendShape_data()
+             << false
+             << false;
+ }
++*/
+ 
+ void tst_QGeoCircle::areaComparison_data()
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 17a5fb9..dc24520 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+disable_qgeocircle_extendShape_tests.patch
 skip_failing_tests.patch
+appSpecificTileCache.diff

-- 
qtlocation packaging