[neon/qt6/qt6-base/Neon/unstable] debian/patches: temp patch for kwallet

[Carlos De Maine]

Git commit a6c61e5df8a24e8aaed5925cd01673fb86ff5586 by Carlos De Maine.
Committed on 12/07/2023 at 07:36.
Pushed by carlosdem into branch 'Neon/unstable'.

temp patch for kwallet

A  +62   -0    debian/patches/kwallet_fix_temp.patch
M  +3    -0    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/a6c61e5df8a24e8aaed5925cd01673fb86ff5586

diff --git a/debian/patches/kwallet_fix_temp.patch b/debian/patches/kwallet_fix_temp.patch
new file mode 100644
index 0000000..c2c7e28
--- /dev/null
+++ b/debian/patches/kwallet_fix_temp.patch
@@ -0,0 +1,62 @@
+From https://codereview.qt-project.org/qt/qtbase
+ * branch                  refs/changes/16/485616/3 -> FETCH_HEAD
+From 838f66be51103b8567ee22b71bd8e6102297b681 Mon Sep 17 00:00:00 2001
+From: Fabian Kosmale <fabian.kosmale at qt.io>
+Date: Mon, 13 Mar 2023 17:59:35 +0100
+Subject: [PATCH] moc: Handle attributes after meta-method tag
+
+We so far only handled them if they came at the very start of the method
+declaration.
+This patch ensures that we also handle them after the meta-method tag
+(but before the actual type).
+Unifying parseFunction and parseMaybeFunction to avoid the need to
+munally keep them in sync is left for another day.
+
+Fixes: QTBUG-111330
+Change-Id: Ic94edb69f04b9150aea2c8e6d004a8b9e5cf12ec
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+(cherry picked from commit 44b5ad01f0da55a351e0855e1173acfbef77221d)
+Reviewed-by: Ulf Hermann <ulf.hermann at qt.io>
+---
+ src/tools/moc/moc.cpp            | 21 +++++++++++++++++----
+ src/tools/moc/moc.h              |  1 +
+ tests/auto/tools/moc/tst_moc.cpp | 28 ++++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 4 deletions(-)
+
+diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
+index d4973b87ac..09bc1e26a1 100644
+--- a/src/tools/moc/moc.cpp
++++ b/src/tools/moc/moc.cpp
+@@ -409,8 +409,7 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
+     def->isVirtual = false;
+     def->isStatic = false;
+     //skip modifiers and attributes
+-    while (test(INLINE) || (test(STATIC) && (def->isStatic = true) == true) ||
+-        (test(VIRTUAL) && (def->isVirtual = true) == true) //mark as virtual
++    while (testForFunctionModifiers(def)
+         || skipCxxAttributes() || testFunctionAttribute(def) || testFunctionRevision(def)) {}
+     bool templateFunction = (lookup() == TEMPLATE);
+     def->type = parseType();
+@@ -426,6 +425,10 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
+         scopedFunctionName = def->type.isScoped;
+         def->type = Type("int");
+     } else {
++        // we might have modifiers and attributes after a tag
++        // note that testFunctionAttribute is handled further below,
++        // and revisions and attributes must come first
++        while (testForFunctionModifiers(def)) {}
+         Type tempType = parseType();;
+         while (!tempType.name.isEmpty() && lookup() != LPAREN) {
+             if (testFunctionAttribute(def->type.firstToken, def))
+@@ -509,14 +512,20 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
+     return true;
+ }
+ 
++bool Moc::testForFunctionModifiers(FunctionDef *def)
++{
++    return test(EXPLICIT) || test(INLINE) ||
++            (test(STATIC) && (def->isStatic = true)) ||
++            (test(VIRTUAL) && (def->isVirtual = true));
++}
++
+:
diff --git a/debian/patches/series b/debian/patches/series
index d598193..7f2787f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,6 @@ build_path_embedded_qtbuildinternalsextra_cmake.patch
 
 # Don't use yield on CPUs that might not support it
 armel-noyield.patch
+
+#kwallet_temp_fix
+kwallet_temp_fix.patch
\ No newline at end of file