[neon/qt/qtbase/Neon/release] debian/patches: and another upstream applied patch

[Harald Sitter]

Git commit dac93a90405a26f8325e254ab3e9029ec22543ae by Harald Sitter.
Committed on 13/09/2022 at 09:55.
Pushed by sitter into branch 'Neon/release'.

and another upstream applied patch

D  +0    -39   debian/patches/moc_handle_include.diff
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/dac93a90405a26f8325e254ab3e9029ec22543ae

diff --git a/debian/patches/moc_handle_include.diff b/debian/patches/moc_handle_include.diff
deleted file mode 100644
index bf71839..0000000
--- a/debian/patches/moc_handle_include.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: handle even more include in enum cases
- The solution in d3ed7dac8aa2f4ede0c409254b9dd44842086be0 was needlessly
- complicated, and broke a valid use case.
- The issue of no identifier being available to parse after the include
- has been processed can instead be solved by moving the test for the
- closing brace after the include processing.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=87973325f1b99f2b
-Last-Update: 2022-04-07
-
---- a/src/tools/moc/moc.cpp
-+++ b/src/tools/moc/moc.cpp
-@@ -306,10 +306,9 @@ bool Moc::parseEnum(EnumDef *def)
-             return IncludeState::NoInclude;
-     };
-     do {
-+        handleInclude();
-         if (lookup() == RBRACE) // accept trailing comma
-             break;
--        if ( handleInclude() == IncludeState::IncludeEnd)
--            continue;
-         next(IDENTIFIER);
-         def->values += lexem();
-         handleInclude();
-Index: qtbase/tests/auto/tools/moc/enum_with_include.h
-===================================================================
---- qtbase.orig/tests/auto/tools/moc/enum_with_include.h
-+++ qtbase/tests/auto/tools/moc/enum_with_include.h
-@@ -34,6 +34,11 @@ class Foo : public QObject {
-     enum en {
-        #include <enum_inc.h>
-     };
-+
-+    enum class en2 {
-+       #include <enum_inc.h>
-+       reference = 42
-+    };
-     Q_OBJECT
- };
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index d3b5b51..8e6114e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,7 @@ fix_recursion_crash.diff
 #CVE-2021-38593.diff
 #openssl3.diff
 #CVE-2022-25255.diff
-moc_handle_include.diff
+#moc_handle_include.diff
 #remove_limit_on_number_of_streams.diff
 
 # Debian specific.