[SCM] marble packaging branch, master, updated. debian/4.13.1-1-4-g0797e12

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/marble.git;a=commitdiff;h=0797e12

The following commit has been merged in the master branch:
commit 0797e12c3fba492fa4187a7b4ab0e220c0e0790f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 1 16:10:44 2014 +0200

    fix build when qreal != double
    
    backport upstream commit d74ea1c8f4e983329bdae96b04e6958d207043c4
---
 debian/changelog                                   |  5 ++++
 debian/patches/series                              |  1 +
 ...pstream_tests-fix-build-when-qreal-double.patch | 28 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 33c15f8..bda9b73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ marble (4:4.13.1-2) UNRELEASED; urgency=medium
   [ Maximiliano Curia ]
   * Update copyright information.
 
+  [ Pino Toscano ]
+  * Backport upstream commit d74ea1c8f4e983329bdae96b04e6958d207043c4 to fix
+    build when qreal != double; patch
+    upstream_tests-fix-build-when-qreal-double.patch.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2014 10:17:54 +0200
 
 marble (4:4.13.1-1) experimental; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index a2ff3c0..b69f2bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
+upstream_tests-fix-build-when-qreal-double.patch
diff --git a/debian/patches/upstream_tests-fix-build-when-qreal-double.patch b/debian/patches/upstream_tests-fix-build-when-qreal-double.patch
new file mode 100644
index 0000000..f77da15
--- /dev/null
+++ b/debian/patches/upstream_tests-fix-build-when-qreal-double.patch
@@ -0,0 +1,28 @@
+From d74ea1c8f4e983329bdae96b04e6958d207043c4 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 1 Jun 2014 15:52:40 +0200
+Subject: [PATCH] tests: fix build when qreal!=double
+
+Just use qreal when a qreal& argument is expected.
+
+(cherry picked from commit 54f86b39d7e8d14d0ce915b9e98087f1d4d20b74)
+---
+ tests/GeoUriParserTest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/GeoUriParserTest.cpp b/tests/GeoUriParserTest.cpp
+index 20268e9..c0d91d3 100644
+--- a/tests/GeoUriParserTest.cpp
++++ b/tests/GeoUriParserTest.cpp
+@@ -71,7 +71,7 @@ void GeoUriParserTest::testGeoUri()
+ 
+     GeoDataCoordinates coords = parser.coordinates();
+ 
+-    double cLat = 0.0, cLon = 0.0, cAlt = 0.0;
++    qreal cLat = 0.0, cLon = 0.0, cAlt = 0.0;
+     coords.geoCoordinates(cLon, cLat, cAlt, GeoDataCoordinates::Degree);
+ 
+     QCOMPARE(ret, valid);
+-- 
+2.0.0.rc2
+

-- 
marble packaging