diff options
| author | Sam James <sam@gentoo.org> | 2024-01-12 14:01:42 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-01-12 14:03:17 +0000 |
| commit | 7ba1a95c33080c581b30aaafd55973509b0b5c01 (patch) | |
| tree | c8506665c2df181000ea84f4ac05b1d6972639d0 /net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch | |
| parent | 5296534e2931b2274cd3e320dbb2846328f151a3 (diff) | |
| download | gentoo-7ba1a95c33080c581b30aaafd55973509b0b5c01.tar.gz gentoo-7ba1a95c33080c581b30aaafd55973509b0b5c01.tar.bz2 gentoo-7ba1a95c33080c581b30aaafd55973509b0b5c01.zip | |
net-libs/signond: add 8.61-r100 (with Qt 6 support)
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch')
| -rw-r--r-- | net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch b/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch new file mode 100644 index 000000000000..0cc5a3f31925 --- /dev/null +++ b/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch @@ -0,0 +1,33 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From f4e9e3b541027eb0a360d4e3de27ac48b67411eb Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 17:14:47 +0200 +Subject: [PATCH 10/11] Fix plugin datastream in Qt6 + +We send the size of the to-be-sent data to the datastream + +In Qt6 QByteArray::size() is 64 bit, but the other side reads it as int, breaking the communication + +Cast the size to int to avoid that +--- + lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp +index d156659..fe35031 100644 +--- a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp ++++ b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp +@@ -63,7 +63,8 @@ bool BlobIOHandler::sendData(const QVariantMap &map) + + QDataStream stream(m_writeChannel); + QByteArray ba = variantMapToByteArray(map); +- stream << ba.size(); ++ // in Qt6 QByteArray::size() is 64 bit, but the receiving side expects int ++ stream << static_cast<int>(ba.size()); + + QVector<QByteArray> pages = pageByteArray(ba); + for (int i = 0; i < pages.count(); ++i) +-- +2.43.0 + |
