[neon/forks/kaidan/Neon/unstable] debian/patches: drop patches that have been upstreamed
Carlos De Maine
null at kde.org
Sun Feb 26 09:16:23 GMT 2023
Git commit d75a11be45bfc702c2d6a81930a161836999418e by Carlos De Maine.
Committed on 26/02/2023 at 09:16.
Pushed by carlosdem into branch 'Neon/unstable'.
drop patches that have been upstreamed
D +0 -43 debian/patches/patch01.diff
D +0 -33 debian/patches/qrcode.diff
D +0 -22 debian/patches/qrcode2.diff
D +0 -26 debian/patches/qrcode3.diff
D +0 -1 debian/patches/series
https://invent.kde.org/neon/forks/kaidan/commit/d75a11be45bfc702c2d6a81930a161836999418e
diff --git a/debian/patches/patch01.diff b/debian/patches/patch01.diff
deleted file mode 100644
index e458c97..0000000
--- a/debian/patches/patch01.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,7 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Concurrent
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO CoreAddons Kirigami2)
- find_package(KQuickImageEditor REQUIRED)
- find_package(KF5KirigamiAddons 0.7.0 REQUIRED)
--find_package(ZXing 1.1.1 REQUIRED)
-+find_package(ZXing 2.0.0 REQUIRED)
- find_package(QXmpp 1.5.0 REQUIRED COMPONENTS Omemo)
-
- # Optional QtQuickCompiler
-
-diff --git a/src/QrCodeDecoder.cpp b/src/QrCodeDecoder.cpp
-index 905606bf74ccc5ad8f2227197a92f71766143ff9..7c17a6f50879b5bfcb8c654f08e20cc4fd5d14a1 100644
---- a/src/QrCodeDecoder.cpp
-+++ b/src/QrCodeDecoder.cpp
-@@ -39,10 +39,6 @@
- #include <ZXing/ReadBarcode.h>
- #include <ZXing/BarcodeFormat.h>
- #include <ZXing/DecodeHints.h>
--#include <ZXing/GenericLuminanceSource.h>
--#include <ZXing/HybridBinarizer.h>
--#include <ZXing/LuminanceSource.h>
--#include <ZXing/MultiFormatReader.h>
- #include <ZXing/Result.h>
- #include <ZXing/TextUtfEncoding.h>
-
-diff --git a/src/QrCodeGenerator.cpp b/src/QrCodeGenerator.cpp
-index 4f9ca073352630663bb36d4d6d43c1f245b9d9c5..bc9fd761374cb3fec06d53ad0c6102e772c01399 100644
---- a/src/QrCodeGenerator.cpp
-+++ b/src/QrCodeGenerator.cpp
-@@ -33,10 +33,6 @@
- #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>
-
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 090cd50..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-patch01.diff
More information about the Neon-commits
mailing list