[neon/qt/qtbase/Neon/release] debian: Refresh existing patches.

[Simon Quigley]

Git commit e306f2a5a9fe7bde59c298e3ea1cc4c1c75ec861 by Simon Quigley.
Committed on 18/06/2022 at 01:15.
Pushed by jriddell into branch 'Neon/release'.

Refresh existing patches.

M  +1    -0    debian/changelog
M  +2    -2    debian/patches/cross_build_mysql.diff
M  +1    -1    debian/patches/fix_recursion_crash.diff
M  +1    -1    debian/patches/moc_handle_include.diff

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

diff --git a/debian/changelog b/debian/changelog
index 3b690ac..13d0adf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtbase-opensource-src (5.15.5+dfsg-1) UNRELEASED; urgency=medium
   * Remove reverse-applicable upstream patches:
     - gcc_11_limits.diff
     - CVE-2021-38593.diff
+  * Refresh existing patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Jun 2022 19:52:14 -0500
 
diff --git a/debian/patches/cross_build_mysql.diff b/debian/patches/cross_build_mysql.diff
index 9d5ce09..169a12e 100644
--- a/debian/patches/cross_build_mysql.diff
+++ b/debian/patches/cross_build_mysql.diff
@@ -8,8 +8,8 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
 Forwarded: not-needed
 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 
---- qtbase-opensource-src-5.14.2+dfsg.orig/src/plugins/sqldrivers/configure.json
-+++ qtbase-opensource-src-5.14.2+dfsg/src/plugins/sqldrivers/configure.json
+--- a/src/plugins/sqldrivers/configure.json
++++ b/src/plugins/sqldrivers/configure.json
 @@ -67,6 +67,7 @@
              },
              "headers": "mysql.h",
diff --git a/debian/patches/fix_recursion_crash.diff b/debian/patches/fix_recursion_crash.diff
index 6ee2ebe..46e5fb2 100644
--- a/debian/patches/fix_recursion_crash.diff
+++ b/debian/patches/fix_recursion_crash.diff
@@ -10,7 +10,7 @@ Last-Update: 2021-11-13
 
 --- a/src/widgets/styles/qstylesheetstyle.cpp
 +++ b/src/widgets/styles/qstylesheetstyle.cpp
-@@ -2646,6 +2646,9 @@ void QStyleSheetStyle::setProperties(QWi
+@@ -2649,6 +2649,9 @@ void QStyleSheetStyle::setProperties(QWi
          default: v = decl.d->values.at(0).variant; break;
          }
  
diff --git a/debian/patches/moc_handle_include.diff b/debian/patches/moc_handle_include.diff
index a337b49..4b3a333 100644
--- a/debian/patches/moc_handle_include.diff
+++ b/debian/patches/moc_handle_include.diff
@@ -9,7 +9,7 @@ Last-Update: 2022-04-07
 
 --- a/src/tools/moc/moc.cpp
 +++ b/src/tools/moc/moc.cpp
-@@ -305,10 +305,9 @@ bool Moc::parseEnum(EnumDef *def)
+@@ -306,10 +306,9 @@ bool Moc::parseEnum(EnumDef *def)
              return IncludeState::NoInclude;
      };
      do {