[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-16ubuntu1-3-gf833ba6

Timo Jyrinki timo at moszumanska.debian.org
Mon Apr 4 10:41:33 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 5e3776827d66f42d43feb19fc5b3b8aeec45819b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Mar 22 09:09:36 2016 +0000

    Temporarily disable a test broken by glibc upgrade (LP: #1560528).
---
 debian/changelog                  |  5 +++--
 debian/patches/enable-tests.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1c57bf..9502e84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-qtbase-opensource-src (5.5.1+dfsg-16ubuntu2) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.5.1+dfsg-16ubuntu3) UNRELEASED; urgency=medium
 
   * debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch:
     - Fix typos in property definitions. (LP: #1557259)
+  * Temporarily disable a test broken by glibc upgrade (LP: #1560528). 
 
- -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 22 Mar 2016 09:09:08 +0000
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 29 Mar 2016 11:30:45 +0000
 
 qtbase-opensource-src (5.5.1+dfsg-16ubuntu1) xenial; urgency=medium
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 29abcec..f17bd03 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -23582,3 +23582,14 @@ diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/qtextstream/tst_
      }
      {
          // Shift-JIS device
+diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/largefile/tst_largefile.cpp qtbase-opensource-src-5.5.1/tests/auto/corelib/io/largefile/tst_largefile.cpp
+--- qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/largefile/tst_largefile.cpp	2016-03-29 11:27:07.416069388 +0000
++++ qtbase-opensource-src-5.5.1/tests/auto/corelib/io/largefile/tst_largefile.cpp	2016-03-29 11:26:44.536068919 +0000
+@@ -505,6 +505,7 @@
+ //Mac: memory-mapping beyond EOF may succeed but it could generate bus error on access
+ void tst_LargeFile::mapOffsetOverflow()
+ {
++        QSKIP("Skipped for now also on 32-bit, see LP: #1560528");
+ #ifndef Q_OS_MAC
+     // Out-of-range mappings should fail, and not silently clip the offset
+     for (int i = 50; i < 63; ++i) {

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list