[SCM] qtlocation packaging branch, master, updated. debian/5.3.2-1-4-gbaaa832

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Tue Sep 23 03:34:30 UTC 2014


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

The following commit has been merged in the master branch:
commit e05bfd18b661963d5233e8fd00388d10669ac37a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Sep 23 00:33:56 2014 -0300

    Update the patch to make it work.
---
 .../disable_qgeocircle_extendShape_tests.patch       | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/patches/disable_qgeocircle_extendShape_tests.patch b/debian/patches/disable_qgeocircle_extendShape_tests.patch
index 756085e..4acd086 100644
--- a/debian/patches/disable_qgeocircle_extendShape_tests.patch
+++ b/debian/patches/disable_qgeocircle_extendShape_tests.patch
@@ -6,8 +6,8 @@ Bug-Qt: https://bugreports.qt-project.org/browse/QTBUG-41447
 Forwarded: not-needed
 
 ---
- tests/auto/qgeocircle/tst_qgeocircle.cpp |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ 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
@@ -23,3 +23,19 @@ Forwarded: not-needed
  
      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()
+ {

-- 
qtlocation packaging



More information about the pkg-kde-commits mailing list