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

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 433caf7b5d424ccd55e66b2097bfd6abb1a07f78
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 14 12:25:12 2015 +0000

    Rebase debian/patches/appSpecificTileCache.diff.
---
 debian/changelog                         |  1 +
 debian/patches/appSpecificTileCache.diff | 19 +++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe52058..308c219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtlocation-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update .install files.
   * Update symbols from build logs.
+  * Rebase debian/patches/appSpecificTileCache.diff.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 27 Mar 2015 07:03:26 +0000
 
diff --git a/debian/patches/appSpecificTileCache.diff b/debian/patches/appSpecificTileCache.diff
index 47d23aa..f7c1f25 100644
--- a/debian/patches/appSpecificTileCache.diff
+++ b/debian/patches/appSpecificTileCache.diff
@@ -7,16 +7,15 @@ 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 @@
+--- qtlocation-opensource-src-5.5.0-alpha/src/location/maps/qgeotilecache.cpp.old	2015-03-16 16:19:00.000000000 +0000
++++ qtlocation-opensource-src-5.5.0-alpha/src/location/maps/qgeotilecache.cpp	2015-03-27 07:07:08.761722068 +0000
+@@ -104,8 +104,7 @@
+     // rather than in each individual plugin (the plugins can
      // of course override them)
  
-     if (directory_.isEmpty()) {
--        directory_ = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)
--                + QLatin1String("/QtLocation");
-+        directory_ = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
-         QDir::root().mkpath(directory_);
-     }
+-    const QString basePath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)
+-                 + QLatin1String("/QtLocation");
++    const QString basePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
  
+     // delete old tiles from QtLocation 5.4 or prior
+     // TODO Remove cache cleanup in Qt 6

-- 
qtlocation packaging