[SCM] qbs packaging branch, experimental, updated. debian/1.4.1+dfsg-2-4-g25c1478

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 25c14785197db125ea665f0e585a55b5008ce3c4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 11 19:53:45 2015 +0300

    Disable moc-hpp-included test which currently fails because of a bug in QtScript.
---
 debian/changelog                             |  2 ++
 debian/patches/disable_moc_hpp_included.diff | 29 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 63e0d40..f937055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qbs (1.4.1+dfsg-3) UNRELEASED; urgency=medium
     where it is supported (fix_assembly_test.diff).
   * Replace revert_tests_speedup.diff with proposed upstream version
     by Christian Kandeler.
+  * Disable moc-hpp-included test which currently fails because of a bug
+    in QtScript on some architectures (disable_moc_hpp_included.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 Jul 2015 14:45:25 +0300
 
diff --git a/debian/patches/disable_moc_hpp_included.diff b/debian/patches/disable_moc_hpp_included.diff
new file mode 100644
index 0000000..4ddc93a
--- /dev/null
+++ b/debian/patches/disable_moc_hpp_included.diff
@@ -0,0 +1,29 @@
+Description: remove a test that fails because of QtScript bug
+ The stacktrace is (obtained on ppc64el):
+   #0  SLL_PopRange (end=<synthetic pointer>, start=<synthetic pointer>, N=<optimized out>, head=0x3fffb32004e0) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:742
+   #1  PopRange (end=<synthetic pointer>, start=<synthetic pointer>, N=<optimized out>, this=0x3fffb32004e0) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:2083
+   #2  ReleaseToCentralCache (N=192, cl=<optimized out>, this=0x3fffb3200478) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:2795
+   #3  QTWTF::TCMalloc_ThreadCache::Cleanup (this=0x3fffb3200478) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:2745
+   #4  0x00003fffb724c6d8 in QTWTF::TCMalloc_ThreadCache::DeleteCache (heap=0x3fffb3200478) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:3069
+   #5  0x00003fffb6a48604 in __nptl_deallocate_tsd () at pthread_create.c:157
+   #6  0x00003fffb6a489b8 in start_thread (arg=0x3fffb441f160) at pthread_create.c:322
+   #7  0x00003fffb745f870 in clone () at ../sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S:104
+ .
+ QBS is going to be ported away from QtScript, but in the mean time remove this test
+ so it does not block the build.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-07-11
+
+--- a/tests/auto/api/tst_api.cpp
++++ b/tests/auto/api/tst_api.cpp
+@@ -304,9 +304,6 @@
+     QTest::newRow("Q_OBJECT in header")
+             << QString("moc-hpp")
+             << relativeExecutableFilePath("moc_hpp");
+-    QTest::newRow("Q_OBJECT in header, moc_XXX.cpp included")
+-            << QString("moc-hpp-included")
+-            << relativeExecutableFilePath("moc_hpp_included");
+     QTest::newRow("app and lib with same source file")
+             << QString("lib-same-source")
+             << relativeExecutableFilePath("HelloWorldApp");
diff --git a/debian/patches/series b/debian/patches/series
index 7a5219e..df0c825 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ skip_test.diff
 remove_rpaths.diff
 revert_tests_speedup.diff
 fix_assembly_test.diff
+disable_moc_hpp_included.diff

-- 
qbs packaging