[neon/extras/qca2/Neon/stable] debian: update the patches
Pino Toscano
null at kde.org
Fri Oct 21 20:12:11 BST 2022
Git commit 540dc835df46894d7e16ba75b219b299a51c3a6a by Pino Toscano.
Committed on 04/02/2021 at 23:13.
Pushed by jriddell into branch 'Neon/stable'.
update the patches
- define_qca_export.diff: refresh
- pipeunittest_more_wait.diff: refresh
- hurd_msync.diff: refresh
M +4 -0 debian/changelog
M +5 -5 debian/patches/define_qca_export.diff
M +17 -17 debian/patches/hurd_msync.diff
M +54 -54 debian/patches/pipeunittest_more_wait.diff
https://invent.kde.org/neon/extras/qca2/commit/540dc835df46894d7e16ba75b219b299a51c3a6a
diff --git a/debian/changelog b/debian/changelog
index c1f8f50..d0c6b48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ qca2 (2.3.2-0r1) UNRELEASED; urgency=medium
* Update the build dependencies according to the upstream build system:
- bump Qt5 to 5.9
* Bump Standards-Version to 4.5.1, no changes required.
+ * Update the patches:
+ - define_qca_export.diff: refresh
+ - pipeunittest_more_wait.diff: refresh
+ - hurd_msync.diff: refresh
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 17 Aug 2020 07:29:05 -0000
diff --git a/debian/patches/define_qca_export.diff b/debian/patches/define_qca_export.diff
index 972036e..a274447 100644
--- a/debian/patches/define_qca_export.diff
+++ b/debian/patches/define_qca_export.diff
@@ -5,11 +5,11 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
--- a/include/QtCrypto/qca_export.h
+++ b/include/QtCrypto/qca_export.h
@@ -44,6 +44,8 @@
- # define QCA_EXPORT Q_DECL_IMPORT
- # endif
- # endif
+ #define QCA_EXPORT Q_DECL_IMPORT
+ #endif
+ #endif
+#else
-+# define QCA_EXPORT Q_DECL_EXPORT
++#define QCA_EXPORT Q_DECL_EXPORT
#endif
#ifndef QCA_EXPORT
- # define QCA_EXPORT
+ #define QCA_EXPORT
diff --git a/debian/patches/hurd_msync.diff b/debian/patches/hurd_msync.diff
index 7487aa0..4a46727 100644
--- a/debian/patches/hurd_msync.diff
+++ b/debian/patches/hurd_msync.diff
@@ -18,26 +18,26 @@ Forwarded: not-needed
+namespace QCA { // WRAPNS_LINE
#ifndef MAP_FAILED
- #define MAP_FAILED -1
-@@ -161,11 +164,19 @@ void MemoryMapping_Allocator::dealloc_bl
- for(u32bit j = 0; j != OVERWRITE_PASSES; j++)
- {
- std::memset(ptr, PATTERNS[j % sizeof(PATTERNS)], n);
-- if(msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC))
-+ if(msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC)
+ #define MAP_FAILED -1
+@@ -169,11 +172,19 @@ void MemoryMapping_Allocator::dealloc_bl
+
+ for (u32bit j = 0; j != OVERWRITE_PASSES; j++) {
+ std::memset(ptr, PATTERNS[j % sizeof(PATTERNS)], n);
+- if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC))
++ if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC)
+#ifdef __GNU__
-+ && errno != ENOSYS
++ && errno != ENOSYS
+#endif
-+ )
- throw MemoryMapping_Failed("Sync operation failed");
- }
- std::memset(ptr, 0, n);
-- if(msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC))
-+ if(msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC)
++ )
+ throw MemoryMapping_Failed("Sync operation failed");
+ }
+ std::memset(ptr, 0, n);
+- if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC))
++ if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC)
+#ifdef __GNU__
+ && errno != ENOSYS
+#endif
-+ )
- throw MemoryMapping_Failed("Sync operation failed");
++ )
+ throw MemoryMapping_Failed("Sync operation failed");
- if(munmap(MLOCK_TYPE_CAST ptr, n))
+ if (munmap(MLOCK_TYPE_CAST ptr, n))
diff --git a/debian/patches/pipeunittest_more_wait.diff b/debian/patches/pipeunittest_more_wait.diff
index ff0e3c8..82652f0 100644
--- a/debian/patches/pipeunittest_more_wait.diff
+++ b/debian/patches/pipeunittest_more_wait.diff
@@ -9,97 +9,97 @@ Forwarded: no
--- a/unittest/pipeunittest/pipeunittest.cpp
+++ b/unittest/pipeunittest/pipeunittest.cpp
-@@ -109,17 +109,17 @@ void PipeUnitTest::readWrite()
+@@ -110,17 +110,17 @@ void PipeUnitTest::readWrite()
pipe1.readEnd().enable();
- pipe1.writeEnd().write( testData1 );
-- QTest::qWait(1); // process events
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
-+ QTest::qWait(100); // process events
+ pipe1.writeEnd().write(testData1);
+- QTest::qWait(1); // process events
+- QTest::qWait(1); // process events
++ QTest::qWait(100); // process events
++ QTest::qWait(100); // process events
QByteArray out1 = pipe1.readEnd().read(); // read all...
- QCOMPARE( testData1, out1 );
+ QCOMPARE(testData1, out1);
- pipe1.writeEnd().write( testData1 ); // put it back in
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() );
+ pipe1.writeEnd().write(testData1); // put it back in
+- QTest::qWait(1); // process events
++ QTest::qWait(100); // process events
+ QCOMPARE(pipe1.readEnd().bytesAvailable(), testData1.size());
- pipe1.writeEnd().write( testData2 ); // add some more data
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size() );
+ pipe1.writeEnd().write(testData2); // add some more data
+- QTest::qWait(1); // process events
++ QTest::qWait(100); // process events
+ QCOMPARE(pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size());
QByteArray thisRead = pipe1.readEnd().read(1);
- QCOMPARE( thisRead, QByteArray("D") );
-@@ -144,17 +144,17 @@ void PipeUnitTest::readWriteSecure()
+ QCOMPARE(thisRead, QByteArray("D"));
+@@ -145,17 +145,17 @@ void PipeUnitTest::readWriteSecure()
pipe1.readEnd().enable();
- pipe1.writeEnd().writeSecure( testData1 );
-- QTest::qWait(1); // process events
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
-+ QTest::qWait(100); // process events
+ pipe1.writeEnd().writeSecure(testData1);
+- QTest::qWait(1); // process events
+- QTest::qWait(1); // process events
++ QTest::qWait(100); // process events
++ QTest::qWait(100); // process events
QCA::SecureArray out1 = pipe1.readEnd().readSecure(); // read all...
- QCOMPARE( testData1, out1 );
+ QCOMPARE(testData1, out1);
- pipe1.writeEnd().writeSecure( testData1 ); // put it back in
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() );
+ pipe1.writeEnd().writeSecure(testData1); // put it back in
+- QTest::qWait(1); // process events
++ QTest::qWait(100); // process events
+ QCOMPARE(pipe1.readEnd().bytesAvailable(), testData1.size());
- pipe1.writeEnd().writeSecure( testData2 ); // add some more data
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size() );
+ pipe1.writeEnd().writeSecure(testData2); // add some more data
+- QTest::qWait(1); // process events
++ QTest::qWait(100); // process events
+ QCOMPARE(pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size());
QCA::SecureArray thisRead = pipe1.readEnd().readSecure(1);
- QCOMPARE( thisRead, QCA::SecureArray("D") );
-@@ -190,8 +190,8 @@ void PipeUnitTest::signalTests()
+ QCOMPARE(thisRead, QCA::SecureArray("D"));
+@@ -191,8 +191,8 @@ void PipeUnitTest::signalTests()
QByteArray data("Far better, it is, to dare mighty things");
- pipe->writeEnd().write( data );
+ pipe->writeEnd().write(data);
- QTest::qWait(1);
- QTest::qWait(1);
+ QTest::qWait(100);
+ QTest::qWait(100);
- QCOMPARE( readyReadSpy.count(), 1 );
- QCOMPARE( bytesWrittenSpy.count(), 1 );
+ QCOMPARE(readyReadSpy.count(), 1);
+ QCOMPARE(bytesWrittenSpy.count(), 1);
// this pulls out the first argument to the first signal as an integer
-@@ -202,11 +202,11 @@ void PipeUnitTest::signalTests()
- QCOMPARE( closedReadSpy.count(), 0 );
-
+@@ -203,11 +203,11 @@ void PipeUnitTest::signalTests()
+ QCOMPARE(closedReadSpy.count(), 0);
+
pipe->readEnd().close();
- QTest::qWait(1);
+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 0 );
- QCOMPARE( closedReadSpy.count(), 1 );
+ QCOMPARE(closedWriteSpy.count(), 0);
+ QCOMPARE(closedReadSpy.count(), 1);
pipe->writeEnd().close();
- QTest::qWait(1);
+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 1 );
- QCOMPARE( closedReadSpy.count(), 1 );
+ QCOMPARE(closedWriteSpy.count(), 1);
+ QCOMPARE(closedReadSpy.count(), 1);
}
-@@ -237,8 +237,8 @@ void PipeUnitTest::signalTestsSecure()
+@@ -238,8 +238,8 @@ void PipeUnitTest::signalTestsSecure()
QCA::SecureArray data("Far better, it is, to dare mighty things");
- pipe->writeEnd().writeSecure( data );
+ pipe->writeEnd().writeSecure(data);
- QTest::qWait(1);
- QTest::qWait(1);
+ QTest::qWait(100);
+ QTest::qWait(100);
- QCOMPARE( readyReadSpy.count(), 1 );
- QCOMPARE( bytesWrittenSpy.count(), 1 );
+ QCOMPARE(readyReadSpy.count(), 1);
+ QCOMPARE(bytesWrittenSpy.count(), 1);
// this pulls out the first argument to the first signal as an integer
-@@ -249,11 +249,11 @@ void PipeUnitTest::signalTestsSecure()
- QCOMPARE( closedReadSpy.count(), 0 );
-
+@@ -250,11 +250,11 @@ void PipeUnitTest::signalTestsSecure()
+ QCOMPARE(closedReadSpy.count(), 0);
+
pipe->readEnd().close();
- QTest::qWait(1);
+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 0 );
- QCOMPARE( closedReadSpy.count(), 1 );
+ QCOMPARE(closedWriteSpy.count(), 0);
+ QCOMPARE(closedReadSpy.count(), 1);
pipe->writeEnd().close();
- QTest::qWait(1);
+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 1 );
- QCOMPARE( closedReadSpy.count(), 1 );
+ QCOMPARE(closedWriteSpy.count(), 1);
+ QCOMPARE(closedReadSpy.count(), 1);
}
More information about the Neon-commits
mailing list