[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.4.0-1-4-g3f0c07b

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit e9859e29a3b3f087759f84639b262b9e0be5e414
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jan 25 10:34:47 2015 +0300

    Add a patch from Helge Deller to fix failing tests.
---
 debian/changelog                        |  3 +++
 debian/patches/fix_qwebsocket_test.diff | 42 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c3acb19..9d8513c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebsockets-opensource-src (5.4.0-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add a patch from Helge Deller to fix failing test on some
+    architectures (closes: #764893).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 Jan 2015 10:31:53 +0300
 
diff --git a/debian/patches/fix_qwebsocket_test.diff b/debian/patches/fix_qwebsocket_test.diff
new file mode 100644
index 0000000..58ebecf
--- /dev/null
+++ b/debian/patches/fix_qwebsocket_test.diff
@@ -0,0 +1,42 @@
+Description: fix failing qwebsocket test on some architectures
+Author: Helge Deller <deller at gmx.de>
+Forwarded: not-yet
+Last-Update: 2015-01-25
+
+--- a/tests/auto/qwebsocket/tst_qwebsocket.cpp
++++ b/tests/auto/qwebsocket/tst_qwebsocket.cpp
+@@ -50,9 +50,6 @@
+     QHostAddress hostAddress() const { return m_pWebSocketServer->serverAddress(); }
+     quint16 port() const { return m_pWebSocketServer->serverPort(); }
+ 
+-Q_SIGNALS:
+-    void closed();
+-
+ private Q_SLOTS:
+     void onNewConnection();
+     void processTextMessage(QString message);
+@@ -71,9 +68,8 @@
+     m_clients()
+ {
+     if (m_pWebSocketServer->listen()) {
+-        connect(m_pWebSocketServer, &QWebSocketServer::newConnection,
+-                this, &EchoServer::onNewConnection);
+-        connect(m_pWebSocketServer, &QWebSocketServer::closed, this, &EchoServer::closed);
++        connect(m_pWebSocketServer, SIGNAL(newConnection()),
++                this, SLOT(onNewConnection()));
+     }
+ }
+ 
+@@ -87,9 +83,9 @@
+ {
+     QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
+ 
+-    connect(pSocket, &QWebSocket::textMessageReceived, this, &EchoServer::processTextMessage);
+-    connect(pSocket, &QWebSocket::binaryMessageReceived, this, &EchoServer::processBinaryMessage);
+-    connect(pSocket, &QWebSocket::disconnected, this, &EchoServer::socketDisconnected);
++    connect(pSocket, SIGNAL(textMessageReceived(QString)), this, SLOT(processTextMessage(QString)));
++    connect(pSocket, SIGNAL(binaryMessageReceived(QByteArray)), this, SLOT(processBinaryMessage(QByteArray)));
++    connect(pSocket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+ 
+     m_clients << pSocket;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..90b55ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_qwebsocket_test.diff

-- 
qtwebsockets packaging