[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-6ubuntu1-4-ge3ec8a2

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit e3ec8a29480aa28204c2efb0cfa2c63274a301e5
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Dec 7 08:44:06 2015 +0000

    Import 5.5.1+dfsg-6ubuntu2 with s390x fixes
---
 debian/changelog                               | 11 +++++++++--
 debian/patches/series                          |  1 +
 debian/patches/skip-largefile-test-s390x.patch | 14 ++++++++++++++
 debian/rules                                   |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e756cf3..c90f2bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-qtbase-opensource-src (5.5.1+dfsg-6ubuntu2) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.5.1+dfsg-6ubuntu3) UNRELEASED; urgency=medium
 
   * debian/patches/enable-tests.patch:
     - Replace the non-DFSG-free RFC files with public domain content.
   * debian/copyright: mention the replacement.
   * Switch to opt-in for architectures to run tests on.
 
- -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 04 Dec 2015 09:44:17 +0000
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 07 Dec 2015 08:43:14 +0000
+
+qtbase-opensource-src (5.5.1+dfsg-6ubuntu2) xenial; urgency=high
+
+  * Skip largefile test on s390x too, in addition to amd64.
+  * Make tests to keep going till the end with -k.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Fri, 04 Dec 2015 16:54:28 +0000
 
 qtbase-opensource-src (5.5.1+dfsg-6ubuntu1) xenial; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 7caf30c..f60c607 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ qt5-qmake-arm-linux-gnueabihf
 Add-workaround-for-GL-on-Android-emulator.patch
 enable-tests.patch
 Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
+skip-largefile-test-s390x.patch
diff --git a/debian/patches/skip-largefile-test-s390x.patch b/debian/patches/skip-largefile-test-s390x.patch
new file mode 100644
index 0000000..6e5221d
--- /dev/null
+++ b/debian/patches/skip-largefile-test-s390x.patch
@@ -0,0 +1,14 @@
+Description: Skip largefile test on s390x too, in addition to amd64.
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+
+--- qtbase-opensource-src-5.5.1+dfsg.orig/tests/auto/corelib/io/largefile/tst_largefile.cpp
++++ qtbase-opensource-src-5.5.1+dfsg/tests/auto/corelib/io/largefile/tst_largefile.cpp
+@@ -511,7 +511,7 @@ void tst_LargeFile::mapOffsetOverflow()
+         uchar *address = 0;
+ 
+         address = largeFile.map(((qint64)1 << i), blockSize);
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(Q_PROCESSOR_S390_X)
+         QEXPECT_FAIL("", "fails on 64-bit Linux (QTBUG-21175)", Abort);
+ #endif
+         QVERIFY( !address );
diff --git a/debian/rules b/debian/rules
index 4296399..50765b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,7 +182,7 @@ endif
 override_dh_auto_test:
 ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(testrun_architectures)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-		xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH)
+		xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH) -k
 endif
 endif
 

-- 
qtbase packaging