[neon/qt/qtbase/Neon/release] debian: merge salsa/experimental

[Jonathan Esk-Riddell]

Git commit e3f4367df5bcad5c62d207d3d3b7e98735f91419 by Jonathan Esk-Riddell.
Committed on 14/07/2022 at 13:46.
Pushed by jriddell into branch 'Neon/release'.

merge salsa/experimental

M  +22   -1    debian/changelog
M  +1    -1    debian/control
M  +2    -4    debian/patches/fix_recursion_crash.diff
M  +2    -4    debian/patches/moc_handle_include.diff
M  +2    -2    debian/patches/series

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

diff --cc debian/patches/series
index 96c6d94,41e7515..22f6c55
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,18 -1,21 +1,18 @@@
  # Backported from upstream.
- gcc_11_limits.diff
+ mime_globs.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
 +#mysql_field_readonly.diff
 +#CVE-2021-38593.diff
 +#openssl3.diff
 +#CVE-2022-25255.diff
  moc_handle_include.diff
 -remove_limit_on_number_of_streams.diff
 +#remove_limit_on_number_of_streams.diff
  
  # Debian specific.
- #gnukfreebsd.diff
+ gnukfreebsd.diff
  no_htmlinfo_example.diff
  remove_privacy_breaches.diff
  link_fbclient.diff