[SCM] qtwebsockets packaging branch, kubuntu_unstable, updated. debian/5.4.1-1-7-g1a7f733
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Sun Mar 29 16:41:16 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebsockets.git;a=commitdiff;h=1a7f733
The following commit has been merged in the kubuntu_unstable branch:
commit 1a7f7335e772dfdb1b9d7b32815340d6933f749f
Author: Rohan Garg <rohan at garg.io>
Date: Sun Mar 29 18:41:13 2015 +0200
Drop all patches, applied upstream
---
debian/changelog | 2 +
debian/patches/fix_kfreebsd_test.patch | 101 --------------------------------
debian/patches/fix_qwebsocket_test.diff | 42 -------------
debian/patches/series | 1 -
4 files changed, 2 insertions(+), 144 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae6d228..3bf6f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
qtwebsockets-opensource-src (5.4.1-2) UNRELEASED; urgency=medium
+ [ Rohan Garg ]
* Simplify install file for the examples package
+ * Drop all patches, applied upstream
-- Rohan Garg <rohangarg at kubuntu.org> Thu, 26 Mar 2015 13:17:21 +0100
diff --git a/debian/patches/fix_kfreebsd_test.patch b/debian/patches/fix_kfreebsd_test.patch
deleted file mode 100644
index 937d122..0000000
--- a/debian/patches/fix_kfreebsd_test.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: fix some tests in kfreebsd.
-Author: Adam Majer <adamm at zombino.com>
-Bug-Qt: https://bugreports.qt-project.org/browse/QTBUG-41448
-
----
- tests/auto/qwebsocket/tst_qwebsocket.cpp | 31 ++++++++++++++++++++++++++++---
- 1 file changed, 28 insertions(+), 3 deletions(-)
-
---- a/tests/auto/qwebsocket/tst_qwebsocket.cpp
-+++ b/tests/auto/qwebsocket/tst_qwebsocket.cpp
-@@ -246,6 +246,7 @@ void tst_QWebSocket::tst_invalidOpen_dat
- QTest::addColumn<QString>("expectedUrl");
- QTest::addColumn<QString>("expectedPeerName");
- QTest::addColumn<QString>("expectedResourceName");
-+ QTest::addColumn<QAbstractSocket::SocketError>("socketErrorAfterConnect");
- QTest::addColumn<QAbstractSocket::SocketState>("stateAfterOpenCall");
- QTest::addColumn<int>("disconnectedCount");
- QTest::addColumn<int>("stateChangedCount");
-@@ -253,18 +254,28 @@ void tst_QWebSocket::tst_invalidOpen_dat
- QTest::newRow("Illegal local address")
- << QStringLiteral("ws://127.0.0.1:1/") << QStringLiteral("ws://127.0.0.1:1/")
- << QStringLiteral("127.0.0.1")
-- << QStringLiteral("/") << QAbstractSocket::ConnectingState
-+ << QStringLiteral("/")
-+#ifdef Q_OS_FREEBSD_KERNEL
-+ << QAbstractSocket::ConnectionRefusedError
-+ << QAbstractSocket::UnconnectedState
-+#else
-+ << QAbstractSocket::UnknownSocketError
-+ << QAbstractSocket::ConnectingState
-+#endif
- << 1
- << 2; //going from connecting to disconnected
- QTest::newRow("URL containing new line in the hostname")
- << QStringLiteral("ws://myhacky
server/") << QString()
- << QString()
-- << QString() << QAbstractSocket::UnconnectedState
-+ << QString()
-+ << QAbstractSocket::UnknownSocketError
-+ << QAbstractSocket::UnconnectedState
- << 0 << 0;
- QTest::newRow("URL containing new line in the resource name")
- << QStringLiteral("ws://127.0.0.1:1/tricky
path") << QString()
- << QString()
- << QString()
-+ << QAbstractSocket::UnknownSocketError
- << QAbstractSocket::UnconnectedState
- << 0 << 0;
- }
-@@ -275,6 +286,7 @@ void tst_QWebSocket::tst_invalidOpen()
- QFETCH(QString, expectedUrl);
- QFETCH(QString, expectedPeerName);
- QFETCH(QString, expectedResourceName);
-+ QFETCH(QAbstractSocket::SocketError, socketErrorAfterConnect);
- QFETCH(QAbstractSocket::SocketState, stateAfterOpenCall);
- QFETCH(int, disconnectedCount);
- QFETCH(int, stateChangedCount);
-@@ -298,7 +310,8 @@ void tst_QWebSocket::tst_invalidOpen()
- QCOMPARE(socket.version(), QWebSocketProtocol::VersionLatest);
- //at this point the socket is in a connecting state
- //so, there should no error at this point
-- QCOMPARE(socket.error(), QAbstractSocket::UnknownSocketError);
-+ // but it depends on the platform
-+ QCOMPARE(socket.error(), socketErrorAfterConnect);
- QVERIFY(!socket.errorString().isEmpty());
- QVERIFY(!socket.isValid());
- QVERIFY(socket.localAddress().isNull());
-@@ -365,7 +378,13 @@ void tst_QWebSocket::tst_invalidOrigin()
-
- //at this point the socket is in a connecting state
- //so, there should no error at this point
-+#ifdef Q_OS_FREEBSD_KERNEL
-+ // except with FreeBSD, which seems too fast for tests
-+ QCOMPARE(socket.error(), QAbstractSocket::ConnectionRefusedError);
-+#else
- QCOMPARE(socket.error(), QAbstractSocket::UnknownSocketError);
-+#endif
-+
- QVERIFY(!socket.errorString().isEmpty());
- QVERIFY(!socket.isValid());
- QVERIFY(socket.localAddress().isNull());
-@@ -374,13 +393,19 @@ void tst_QWebSocket::tst_invalidOrigin()
- QVERIFY(socket.peerAddress().isNull());
- QCOMPARE(socket.peerPort(), quint16(0));
- QCOMPARE(socket.peerName(), QStringLiteral("127.0.0.1"));
-+#ifdef Q_OS_FREEBSD_KERNEL
-+ QCOMPARE(socket.state(), QAbstractSocket::UnconnectedState);
-+#else
- QCOMPARE(socket.state(), QAbstractSocket::ConnectingState);
-+#endif
- QCOMPARE(socket.readBufferSize(), 0);
- QCOMPARE(socket.resourceName(), QStringLiteral("/"));
- QCOMPARE(socket.requestUrl(), QUrl(QStringLiteral("ws://127.0.0.1:1/")));
- QCOMPARE(socket.closeCode(), QWebSocketProtocol::CloseCodeNormal);
-
-+#ifndef Q_OS_FREEBSD_KERNEL
- QVERIFY(errorSpy.wait());
-+#endif
-
- QCOMPARE(errorSpy.count(), 1);
- QList<QVariant> arguments = errorSpy.takeFirst();
diff --git a/debian/patches/fix_qwebsocket_test.diff b/debian/patches/fix_qwebsocket_test.diff
deleted file mode 100644
index 58ebecf..0000000
--- a/debian/patches/fix_qwebsocket_test.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index 90b55ad..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_qwebsocket_test.diff
--
qtwebsockets packaging
More information about the pkg-kde-commits
mailing list