[neon/forks/kaidan/Neon/stable] debian/patches: remove patches in branch

[Jonathan Esk-Riddell]

Git commit 307bfaf35d9199f7c9d5607667c0caf7a2cb9828 by Jonathan Esk-Riddell.
Committed on 22/03/2023 at 11:24.
Pushed by jriddell into branch 'Neon/stable'.

remove patches in branch

D  +0    -33   debian/patches/qrcode.diff
D  +0    -22   debian/patches/qrcode2.diff
D  +0    -26   debian/patches/qrcode3.diff
D  +0    -3    debian/patches/series

https://invent.kde.org/neon/forks/kaidan/commit/307bfaf35d9199f7c9d5607667c0caf7a2cb9828

diff --git a/debian/patches/qrcode.diff b/debian/patches/qrcode.diff
deleted file mode 100644
index 4b3cf4a..0000000
--- a/debian/patches/qrcode.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-commit dc41a3f3850308d5204134ae08e66f20a58195f9
-Author: Melvin Keskin <melvo at olomono.de>
-Date:   Sun Mar 13 13:03:16 2022 +0100
-
-    QrCodeGenerator: Replace deprecated 'BarcodeFormat::QR_CODE' with 'BarcodeFormat::QRCode'
-
-diff --git a/src/QrCodeGenerator.cpp b/src/QrCodeGenerator.cpp
-index b9c8743..1338308 100644
---- a/src/QrCodeGenerator.cpp
-+++ b/src/QrCodeGenerator.cpp
-@@ -33,6 +33,10 @@
- #include <QImage>
- #include <QRgb>
- 
-+#include <ZXing/ZXVersion.h>
-+#define ZXING_VERSION \
-+	QT_VERSION_CHECK(ZXING_VERSION_MAJOR, ZXING_VERSION_MINOR, ZXING_VERSION_PATCH)
-+
- #include <ZXing/BarcodeFormat.h>
- #include <ZXing/MultiFormatWriter.h>
- 
-@@ -74,7 +78,11 @@ QImage QrCodeGenerator::generateBareJidQrCode(int edgePixelCount, const QString
- QImage QrCodeGenerator::generateQrCode(int edgePixelCount, const QString &text)
- {
- 	try {
-+#if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 1)
-+		ZXing::MultiFormatWriter writer(ZXing::BarcodeFormat::QRCode);
-+#else
- 		ZXing::MultiFormatWriter writer(ZXing::BarcodeFormat::QR_CODE);
-+#endif
- 		const ZXing::BitMatrix &bitMatrix = writer.encode(text.toStdWString(), edgePixelCount, edgePixelCount);
- 		return toImage(bitMatrix);
- 	} catch (const std::invalid_argument &e) {
diff --git a/debian/patches/qrcode2.diff b/debian/patches/qrcode2.diff
deleted file mode 100644
index 6cc1323..0000000
--- a/debian/patches/qrcode2.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 9a2f88779064b46ae097a354c97d657901f47d01
-Author: Melvin Keskin <melvo at olomono.de>
-Date:   Fri Feb 18 10:48:46 2022 +0100
-
-    QrCodeDecoder: Replace deprecated 'BarcodeFormat::QR_CODE' with 'BarcodeFormat::QRCode'
-
-diff --git a/src/QrCodeDecoder.cpp b/src/QrCodeDecoder.cpp
-index a84978f..a7b0cf5 100644
---- a/src/QrCodeDecoder.cpp
-+++ b/src/QrCodeDecoder.cpp
-@@ -60,7 +60,11 @@ void QrCodeDecoder::decodeImage(const QImage &image)
- {
- 	// Advise the decoder to check for QR codes and to try decoding rotated versions of the image.
- #if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 0)
-+# if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 1)
-+	const auto decodeHints = DecodeHints().setFormats(BarcodeFormat::QRCode);
-+# else
- 	const auto decodeHints = DecodeHints().setFormats(BarcodeFormat::QR_CODE);
-+# endif
- 	const auto result = ReadBarcode({image.bits(), image.width(), image.height(), ZXing::ImageFormat::Lum, image.bytesPerLine()}, decodeHints);
- #else
- 	const auto decodeHints =
diff --git a/debian/patches/qrcode3.diff b/debian/patches/qrcode3.diff
deleted file mode 100644
index f4c743b..0000000
--- a/debian/patches/qrcode3.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index f278d94..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-qrcode.diff
-qrcode2.diff
-qrcode3.diff