[neon/extras/kdb/Neon/release] debian/patches: merge patches

[Jonathan Esk-Riddell]

Git commit 167982123cb6cab55833a23b3eddd96798cb6add by Jonathan Esk-Riddell.
Committed on 17/10/2022 at 09:43.
Pushed by jriddell into branch 'Neon/release'.

merge patches

D  +0    -61   debian/patches/build-with-newer-qt.diff
R  +0    -0    debian/patches/upstream_PgSQL-driver-fix-build-with-PostgreSQL-12.patch [from: debian/patches/postgres12.diff - 100% similarity]

https://invent.kde.org/neon/extras/kdb/commit/167982123cb6cab55833a23b3eddd96798cb6add

diff --git a/debian/patches/build-with-newer-qt.diff b/debian/patches/build-with-newer-qt.diff
deleted file mode 100644
index a1d8776..0000000
--- a/debian/patches/build-with-newer-qt.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-commit b36d74f13a1421437a725fb74502c993c359392a
-Author: Nicolas Fella <nicolas.fella at gmx.de>
-Date:   Mon Nov 16 16:41:27 2020 +0100
-
-    Fix build with newer Qt
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
diff --git a/debian/patches/postgres12.diff b/debian/patches/upstream_PgSQL-driver-fix-build-with-PostgreSQL-12.patch
similarity index 100%
rename from debian/patches/postgres12.diff
rename to debian/patches/upstream_PgSQL-driver-fix-build-with-PostgreSQL-12.patch