diff options
| -rw-r--r-- | user/qca/APKBUILD | 11 | ||||
| -rw-r--r-- | user/qca/gcc11.patch | 26 | ||||
| -rw-r--r-- | user/qca/test.patch | 77 |
3 files changed, 111 insertions, 3 deletions
diff --git a/user/qca/APKBUILD b/user/qca/APKBUILD index 537b3b9aa..c142f5f42 100644 --- a/user/qca/APKBUILD +++ b/user/qca/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qca pkgver=2.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Qt cryptographic architecture" url="https://userbase.kde.org/QCA" arch="all" @@ -10,7 +10,10 @@ license="LGPL-2.1+" depends="" makedepends="cmake cyrus-sasl-dev qt5-qtbase-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.kde.org/stable/qca/$pkgver/qca-${pkgver}.tar.xz" +source="https://download.kde.org/stable/qca/$pkgver/qca-${pkgver}.tar.xz + gcc11.patch + test.patch + " build() { cmake \ @@ -29,4 +32,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c qca-2.2.1.tar.xz" +sha512sums="3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c qca-2.2.1.tar.xz +ff21970831239f17813c96d47ab690cc15afbc6a8da68c9c1f65d90f7314963ead2778b609ea74e3f26df4046a58907e726f51c31227714bb50c182c66a26e58 gcc11.patch +158e75c4b3940cd74b1bbcdffc2c281d771734169cf61e091c78fec40b218fe4f141c2978a33c121b354cb81235a60eecfca070e375d1e54563a354cd98c22e5 test.patch" diff --git a/user/qca/gcc11.patch b/user/qca/gcc11.patch new file mode 100644 index 000000000..4fc43d818 --- /dev/null +++ b/user/qca/gcc11.patch @@ -0,0 +1,26 @@ +From 32275f1a74c161d2fed8c056b2dd9555687a22f2 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Sun, 24 Jan 2021 18:43:39 +0100 +Subject: [PATCH] Move moc include outside the QCA namespace + +It's the right thing to do and also fixes build with gcc 11 +--- + src/qca_default.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qca_default.cpp b/src/qca_default.cpp +index 7c2a8f89..e31ce3e1 100644 +--- a/src/qca_default.cpp ++++ b/src/qca_default.cpp +@@ -1358,6 +1358,6 @@ QStringList plugin_priorities(Provider *defaultProvider) + return that->shared.plugin_priorities(); + } + +-#include "qca_default.moc" +- + } ++ ++#include "qca_default.moc" +-- +GitLab + diff --git a/user/qca/test.patch b/user/qca/test.patch new file mode 100644 index 000000000..6b9fb12ef --- /dev/null +++ b/user/qca/test.patch @@ -0,0 +1,77 @@ +From b9d914bb3b5b0ecf8568adf1b4610d4da2cde244 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Wed, 15 Sep 2021 10:34:08 +0200 +Subject: [PATCH] Make filewatchunittest much quicker + +Use QSignalSpy::wait to avoid waiting needlessly. +Reduce time to wait for (expected and unexpected) signals to 2s. +--- + .../filewatchunittest/filewatchunittest.cpp | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +diff --git a/unittest/filewatchunittest/filewatchunittest.cpp b/unittest/filewatchunittest/filewatchunittest.cpp +index d1bc117c..63baa655 100644 +--- a/unittest/filewatchunittest/filewatchunittest.cpp ++++ b/unittest/filewatchunittest/filewatchunittest.cpp +@@ -40,7 +40,7 @@ void FileWatchUnitTest::cleanupTestCase() + + void FileWatchUnitTest::filewatchTest() + { +- QWARN("Unittest will take about 1 minute. Please wait."); ++ QWARN("Unittest will take about 10 seconds. Please wait."); + + QCA::FileWatch watcher; + QCOMPARE( watcher.fileName(), QString() ); +@@ -55,41 +55,40 @@ void FileWatchUnitTest::filewatchTest() + + watcher.setFileName( tempFile->fileName() ); + QCOMPARE( watcher.fileName(), tempFile->fileName() ); +- QTest::qWait(7000); ++ QVERIFY(!spy.wait(2000)); + QCOMPARE( spy.count(), 0 ); + tempFile->close(); +- QTest::qWait(7000); ++ QVERIFY(!spy.wait(2000)); + QCOMPARE( spy.count(), 0 ); + + tempFile->open(); + tempFile->write("foo"); + tempFile->flush(); +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 1 ); + + tempFile->close(); +- QTest::qWait(7000); +- ++ QVERIFY(!spy.wait(2000)); + QCOMPARE( spy.count(), 1 ); + + tempFile->open(); + tempFile->write("foo"); + tempFile->flush(); +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 2 ); + + tempFile->write("bar"); + tempFile->flush(); +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 3 ); + + tempFile->close(); +- QTest::qWait(7000); ++ QVERIFY(!spy.wait(2000)); + + QCOMPARE( spy.count(), 3 ); + + delete tempFile; +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 4 ); + } + +-- +GitLab + |