[neon/qt/qtcreator/Neon/release] debian: upstream_Correctly-include-KSyntaxHighlighting-headers.patch: drop

[Pino Toscano]

Git commit c1c2cc1baa3292d9c3e1dd52763049ecbacc8e4d by Pino Toscano.
Committed on 05/06/2022 at 21:04.
Pushed by carlosdem into branch 'Neon/release'.

upstream_Correctly-include-KSyntaxHighlighting-headers.patch: drop

it breaks the embedded KSyntaxHighlighting, used as there is no qt6
version of it

M  +4    -0    debian/changelog
M  +0    -1    debian/patches/series
D  +0    -79   debian/patches/upstream_Correctly-include-KSyntaxHighlighting-headers.patch

https://invent.kde.org/neon/qt/qtcreator/commit/c1c2cc1baa3292d9c3e1dd52763049ecbacc8e4d

diff --git a/debian/changelog b/debian/changelog
index d6634c9..5fee306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,10 @@ qtcreator (7.0.2-100) UNRELEASED; urgency=medium
       - switch qtdeclarative5-dev-tools to qt6-declarative-dev-tools
       - switch qttools5-dev-tools to qt6-tools-dev-tools
       - switch qttranslations5-l10n to qt6-translations-l10n
+    - drop patch upstream_Correctly-include-KSyntaxHighlighting-headers.patch,
+      which does not change the embedded copy of KSyntaxHighlighting, breaking
+      its usage (used because there is no Qt6 version of KSyntaxHighlighting
+      yet)
     - the switch enables the build of the QML Designer plugin, which is built
       only when using Qt >= 6.2.0 (Closes: #1006555)
 
diff --git a/debian/patches/series b/debian/patches/series
index df8e902..860a57d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #Backported patches
-upstream_Correctly-include-KSyntaxHighlighting-headers.patch
 
 # Debian patches.
 debian_paths.diff
diff --git a/debian/patches/upstream_Correctly-include-KSyntaxHighlighting-headers.patch b/debian/patches/upstream_Correctly-include-KSyntaxHighlighting-headers.patch
deleted file mode 100644
index e458be9..0000000
--- a/debian/patches/upstream_Correctly-include-KSyntaxHighlighting-headers.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 4d9215e44d70c10be2c183592e8280c4d7292a83 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Wed, 18 May 2022 18:03:22 +0300
-Subject: [PATCH] Correctly include KSyntaxHighlighting headers
-
-In external KSyntaxHighlighting, these headers now have paths like
-/usr/include/KF5/KSyntaxHighlighting/KSyntaxHighlighting/AbstractHighlighter,
-where /usr/include/KF5/KSyntaxHighlighting is passed to compiler as include
-path.
-
-Old headers which had only one KSyntaxHighlighting fragment in path were
-removed in v5.94.0:
-https://invent.kde.org/frameworks/syntax-highlighting/-/merge_requests/305
-
-Adjust our vendored version to make the code work with both external and
-vendored versions.
-
-Change-Id: Iadcc668c3c705c563ae359301d227ee19eadca0f
-Reviewed-by: Orgad Shaneh <orgads at gmail.com>
-Reviewed-by: <github-actions-qt-creator at cristianadam.eu>
-Reviewed-by: David Schulz <david.schulz at qt.io>
----
- src/plugins/texteditor/highlighter.cpp        |  10 +-
- src/plugins/texteditor/highlighter.h          |   4 +-
- src/plugins/texteditor/textdocumentlayout.h   |   2 +-
- 16 files changed, 72 insertions(+), 66 deletions(-)
-
-diff --git a/src/plugins/texteditor/highlighter.cpp b/src/plugins/texteditor/highlighter.cpp
-index 47204ab890..f8e90f49ab 100644
---- a/src/plugins/texteditor/highlighter.cpp
-+++ b/src/plugins/texteditor/highlighter.cpp
-@@ -38,11 +38,11 @@
- #include <utils/qtcassert.h>
- #include <utils/stylehelper.h>
- 
--#include <DefinitionDownloader>
--#include <FoldingRegion>
--#include <Format>
--#include <Repository>
--#include <SyntaxHighlighter>
-+#include <KSyntaxHighlighting/DefinitionDownloader>
-+#include <KSyntaxHighlighting/FoldingRegion>
-+#include <KSyntaxHighlighting/Format>
-+#include <KSyntaxHighlighting/Repository>
-+#include <KSyntaxHighlighting/SyntaxHighlighter>
- 
- #include <QLoggingCategory>
- #include <QMetaEnum>
-diff --git a/src/plugins/texteditor/highlighter.h b/src/plugins/texteditor/highlighter.h
-index e18a67e8f8..3127589096 100644
---- a/src/plugins/texteditor/highlighter.h
-+++ b/src/plugins/texteditor/highlighter.h
-@@ -29,8 +29,8 @@
- 
- #include <utils/fileutils.h>
- 
--#include <AbstractHighlighter>
--#include <Definition>
-+#include <KSyntaxHighlighting/AbstractHighlighter>
-+#include <KSyntaxHighlighting/Definition>
- 
- namespace TextEditor {
- class TextDocument;
-diff --git a/src/plugins/texteditor/textdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h
-index 69034bf765..3bed9f7bc5 100644
---- a/src/plugins/texteditor/textdocumentlayout.h
-+++ b/src/plugins/texteditor/textdocumentlayout.h
-@@ -32,7 +32,7 @@
- 
- #include <utils/id.h>
- 
--#include <State>
-+#include <KSyntaxHighlighting/State>
- 
- #include <QTextBlockUserData>
- #include <QPlainTextDocumentLayout>
--- 
-2.35.1
-