[SCM] step packaging branch, master, updated. debian/15.08.0-2-3-gdb3639c

Maximiliano Curia maxy at moszumanska.debian.org
Thu Oct 29 17:39:57 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/step.git;a=commitdiff;h=db3639c

The following commit has been merged in the master branch:
commit db3639c632c120cb097fb8c8ddf135cbde14cd71
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Oct 29 18:37:36 2015 +0100

    New workaround patch: wa_qt5.5_qvariant_to_string.diff
---
 debian/changelog                                |  1 +
 debian/patches/series                           |  1 +
 debian/patches/wa_qt5.5_qvariant_to_string.diff | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aacb4b2..617de69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ step (4:15.08.0-3~) UNRELEASED; urgency=medium
 
   * Rebuild for unstable. (Closes: #803381) Thanks to Chris Lamb for reporting
     the issue.
+  * New workaround patch: wa_qt5.5_qvariant_to_string.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Oct 2015 16:18:09 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 24fd20c..b4b9752 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 eigen3.patch
+wa_qt5.5_qvariant_to_string.diff
diff --git a/debian/patches/wa_qt5.5_qvariant_to_string.diff b/debian/patches/wa_qt5.5_qvariant_to_string.diff
new file mode 100644
index 0000000..3d26140
--- /dev/null
+++ b/debian/patches/wa_qt5.5_qvariant_to_string.diff
@@ -0,0 +1,13 @@
+Index: step/autotests/test_metaobject.cc
+===================================================================
+--- step.orig/autotests/test_metaobject.cc	2015-09-17 20:36:29.329219066 +0200
++++ step/autotests/test_metaobject.cc	2015-10-29 18:36:32.605132864 +0100
+@@ -170,7 +170,7 @@
+     QCOMPARE( testObject->property1(), 1.1 );
+     QVERIFY( property->writeVariant(object, QVariant(2.2)) );
+     QCOMPARE( testObject->property1(), 2.2 );
+-    QCOMPARE( property->readString(object), QString("2.2") );
++    QCOMPARE( QString::number(property->readVariant(object).value<double>()), QString("2.2") );
+     QCOMPARE( property->readVariant(object), QVariant(2.2) );
+ 
+     QVERIFY( !property->writeString(object, "not number") );

-- 
step packaging



More information about the pkg-kde-commits mailing list