[neon/qt/qtbase/Neon/release] debian/patches: refresh patches for kde qt branch

[Jonathan Esk-Riddell]

Git commit 20eb68c710b99bba60fb6aa46ef3c5cf22d66f28 by Jonathan Esk-Riddell.
Committed on 05/05/2022 at 10:22.
Pushed by jriddell into branch 'Neon/release'.

refresh patches for kde qt branch

M  +5    -3    debian/patches/cast_types_for_egl_x11_test.diff
M  +6    -4    debian/patches/gcc_11_limits.diff
M  +0    -8    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/20eb68c710b99bba60fb6aa46ef3c5cf22d66f28

diff --git a/debian/patches/cast_types_for_egl_x11_test.diff b/debian/patches/cast_types_for_egl_x11_test.diff
index b581ca0..d3a9c82 100644
--- a/debian/patches/cast_types_for_egl_x11_test.diff
+++ b/debian/patches/cast_types_for_egl_x11_test.diff
@@ -2,9 +2,11 @@ Description: properly cast types for libglvnd 1.3.4
 Origin: https://src.fedoraproject.org/rpms/qt5-qtbase/blob/rawhide/f/qtbase-everywhere-src-5.15.2-libglvnd.patch
 Author: Rex Dieter <rdieter at gmail.com>
 
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -838,9 +838,9 @@
+Index: qtbase/src/gui/configure.json
+===================================================================
+--- qtbase.orig/src/gui/configure.json
++++ qtbase/src/gui/configure.json
+@@ -839,9 +839,9 @@
                  ],
                  "include": [ "EGL/egl.h", "X11/Xlib.h" ],
                  "main": [
diff --git a/debian/patches/gcc_11_limits.diff b/debian/patches/gcc_11_limits.diff
index c254e12..df16351 100644
--- a/debian/patches/gcc_11_limits.diff
+++ b/debian/patches/gcc_11_limits.diff
@@ -2,11 +2,13 @@ Description: include <limits> to fix GCC 11 build
 Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
 Last-Update: 2022-03-03
 
---- a/src/corelib/text/qbytearraymatcher.h
-+++ b/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
+Index: qtbase/src/corelib/text/qbytearraymatcher.h
+===================================================================
+--- qtbase.orig/src/corelib/text/qbytearraymatcher.h
++++ qtbase/src/corelib/text/qbytearraymatcher.h
+@@ -44,6 +44,8 @@
  
- #include <QtCore/qbytearray.h>
+ #include <limits>
  
 +#include <limits>
 +
diff --git a/debian/patches/series b/debian/patches/series
index bb8030b..64a3efa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,19 +1,11 @@
 # Backported from upstream.
 gcc_11_limits.diff
-mime_globs.diff
 fix-invalid-pointer-return-with-QGridLayout.diff
 fix-misplacement-of-placeholder-text-in-QLineEdit.diff
 fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
 fusion_checkable_qpushbutton.diff
-mysql_remove_version_checks.diff
 full_width_selection_rtl.diff
-xcb_add_a_timeout_control_when_reading_INCR_property.diff
 fix_recursion_crash.diff
-mysql_field_readonly.diff
-CVE-2021-38593.diff
-openssl3.diff
-CVE-2022-25255.diff
-gcc-11-qtconcurrentthreadengine.diff
 moc_handle_include.diff
 
 # Debian specific.