[neon/forks/kaidan/Neon/release] debian/patches: more qrcode udpates

Jonathan Esk-Riddell null at kde.org
Wed Feb 22 12:50:18 GMT 2023


Git commit f9b06ab63924758736a403bfba0204e31b88cbc5 by Jonathan Esk-Riddell.
Committed on 22/02/2023 at 12:50.
Pushed by jriddell into branch 'Neon/release'.

more qrcode udpates

A  +26   -0    debian/patches/qrcode3.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/forks/kaidan/commit/f9b06ab63924758736a403bfba0204e31b88cbc5

diff --git a/debian/patches/qrcode3.diff b/debian/patches/qrcode3.diff
new file mode 100644
index 0000000..f4c743b
--- /dev/null
+++ b/debian/patches/qrcode3.diff
@@ -0,0 +1,26 @@
+commit c92fe3125c08e61b454b41f151b435a6a9e6da4b
+Author: Volker Krause <vkrause at kde.org>
+Date:   Wed Jan 4 17:28:31 2023 +0100
+
+    Support ZXing 2.0
+    
+    An alternative approach going forward might be replacing the entire direct
+    ZXing use and video stream processing by KF::Prison. Avoids duplicated
+    maintenance, but adds a new dependency.
+
+diff --git a/src/QrCodeDecoder.cpp b/src/QrCodeDecoder.cpp
+index a7b0cf5..86d1e7b 100644
+--- a/src/QrCodeDecoder.cpp
++++ b/src/QrCodeDecoder.cpp
+@@ -90,7 +90,11 @@ void QrCodeDecoder::decodeImage(const QImage &image)
+ 	// If a QR code could be found and decoded, emit a signal with the decoded string.
+ 	// Otherwise, emit a signal for failed decoding.
+ 	if (result.isValid())
++#if ZXING_VERSION < QT_VERSION_CHECK(2, 0, 0)
+ 		emit decodingSucceeded(QString::fromStdString(TextUtfEncoding::ToUtf8(result.text())));
++#else
++		emit decodingSucceeded(QString::fromStdString(result.text()));
++#endif
+ 	else
+ 		emit decodingFailed();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index d4cbe40..f278d94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 qrcode.diff
 qrcode2.diff
+qrcode3.diff


More information about the Neon-commits mailing list