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

Thu May 5 10:59:26 BST 2022

Git commit e2bb9c713af288191c4e63cf0ea27102d9f55ee0 by Dmitry Shachnev.
Committed on 03/03/2022 at 19:26.
Pushed by jriddell into branch 'Neon/release'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +2    -2    debian/patches/CVE-2022-25255.diff
M  +3    -4    debian/patches/cast_types_for_egl_x11_test.diff
M  +2    -2    debian/patches/fix_recursion_crash.diff
M  +1    -1    debian/patches/full_width_selection_rtl.diff
M  +1    -1    debian/patches/fusion_checkable_qpushbutton.diff
M  +3    -3    debian/patches/openssl3.diff
M  +2    -2    debian/patches/xcb_add_a_timeout_control_when_reading_INCR_property.diff

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

diff --git a/debian/changelog b/debian/changelog
index 8036857..453e9f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtbase-opensource-src (5.15.3+dfsg-1) UNRELEASED; urgency=medium
     - qnam_connect_memory_leak.diff
     - qiodevice_readline_memory.diff
   * Remove most of gcc_11_limits.diff, only one change left.
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Mar 2022 22:13:09 +0300
 
diff --git a/debian/patches/CVE-2022-25255.diff b/debian/patches/CVE-2022-25255.diff
index 764e939..1aec848 100644
--- a/debian/patches/CVE-2022-25255.diff
+++ b/debian/patches/CVE-2022-25255.diff
@@ -72,7 +72,7 @@ Last-Update: 2022-02-21
                  qt_safe_execve(argv[0], argv, envp);
 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
 +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
-@@ -1449,7 +1449,7 @@ void tst_QApplication::desktopSettingsAw
+@@ -1493,7 +1493,7 @@ void tst_QApplication::desktopSettingsAw
  {
  #if QT_CONFIG(process)
      QProcess testProcess;
@@ -81,7 +81,7 @@ Last-Update: 2022-02-21
      QVERIFY2(testProcess.waitForStarted(),
               qPrintable(QString::fromLatin1("Cannot start 'desktopsettingsaware_helper': %1").arg(testProcess.errorString())));
      QVERIFY(testProcess.waitForFinished(10000));
-@@ -2365,7 +2365,7 @@ void tst_QApplication::qtbug_12673()
+@@ -2447,7 +2447,7 @@ void tst_QApplication::qtbug_12673()
  #if QT_CONFIG(process)
      QProcess testProcess;
      QStringList arguments;
diff --git a/debian/patches/cast_types_for_egl_x11_test.diff b/debian/patches/cast_types_for_egl_x11_test.diff
index 547ef00..b581ca0 100644
--- a/debian/patches/cast_types_for_egl_x11_test.diff
+++ b/debian/patches/cast_types_for_egl_x11_test.diff
@@ -2,10 +2,9 @@ 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>
 
-diff -up qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd qtbase-everywhere-src-5.15.2/src/gui/configure.json
---- qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd	2020-10-27 03:02:11.000000000 -0500
-+++ qtbase-everywhere-src-5.15.2/src/gui/configure.json	2021-09-10 10:05:53.610312223 -0500
-@@ -847,9 +847,9 @@
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -838,9 +838,9 @@
                  ],
                  "include": [ "EGL/egl.h", "X11/Xlib.h" ],
                  "main": [
diff --git a/debian/patches/fix_recursion_crash.diff b/debian/patches/fix_recursion_crash.diff
index 0a1a3d5..18667ac 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
-@@ -2626,6 +2626,9 @@ void QStyleSheetStyle::setProperties(QWi
+@@ -2640,6 +2640,9 @@ void QStyleSheetStyle::setProperties(QWi
          default: v = decl.d->values.at(0).variant; break;
          }
  
@@ -30,7 +30,7 @@ Last-Update: 2021-11-13
      void palettePropagation_data();
      void palettePropagation();
      void fontPropagation_data();
-@@ -677,6 +678,23 @@ void tst_QStyleSheetStyle::qproperty()
+@@ -678,6 +679,23 @@ void tst_QStyleSheetStyle::qproperty()
      QCOMPARE(pb.isChecked(), false);
  }
  
diff --git a/debian/patches/full_width_selection_rtl.diff b/debian/patches/full_width_selection_rtl.diff
index 99e042c..36d676c 100644
--- a/debian/patches/full_width_selection_rtl.diff
+++ b/debian/patches/full_width_selection_rtl.diff
@@ -9,7 +9,7 @@ Last-Update: 2021-08-15
 
 --- a/src/gui/text/qtextlayout.cpp
 +++ b/src/gui/text/qtextlayout.cpp
-@@ -1169,10 +1169,17 @@ void QTextLayout::draw(QPainter *p, cons
+@@ -1173,10 +1173,17 @@ void QTextLayout::draw(QPainter *p, cons
                  QRectF fullLineRect(tl.rect());
                  fullLineRect.translate(position);
                  fullLineRect.setRight(QFIXED_MAX);
diff --git a/debian/patches/fusion_checkable_qpushbutton.diff b/debian/patches/fusion_checkable_qpushbutton.diff
index ae284f4..239cc38 100644
--- a/debian/patches/fusion_checkable_qpushbutton.diff
+++ b/debian/patches/fusion_checkable_qpushbutton.diff
@@ -10,7 +10,7 @@ Last-Update: 2021-08-10
 
 --- a/src/widgets/styles/qfusionstyle.cpp
 +++ b/src/widgets/styles/qfusionstyle.cpp
-@@ -1771,14 +1771,6 @@ void QFusionStyle::drawControl(ControlEl
+@@ -1772,14 +1772,6 @@ void QFusionStyle::drawControl(ControlEl
              proxy()->drawControl(CE_PushButtonLabel, &subopt, painter, widget);
          }
          break;
diff --git a/debian/patches/openssl3.diff b/debian/patches/openssl3.diff
index 85d61b8..c394e68 100644
--- a/debian/patches/openssl3.diff
+++ b/debian/patches/openssl3.diff
@@ -123,7 +123,7 @@ Last-Update: 2021-12-09
  DEFINEFUNC3(BIGNUM *, BN_bin2bn, const unsigned char *s, s, int len, len, BIGNUM *ret, ret, return nullptr, return)
  
  #ifndef OPENSSL_NO_EC
-@@ -848,7 +853,6 @@ bool q_resolveOpenSslSymbols()
+@@ -852,7 +857,6 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(EVP_PKEY_CTX_new)
      RESOLVEFUNC(EVP_PKEY_param_check)
      RESOLVEFUNC(EVP_PKEY_CTX_free)
@@ -131,7 +131,7 @@ Last-Update: 2021-12-09
      RESOLVEFUNC(RSA_bits)
      RESOLVEFUNC(OPENSSL_sk_new_null)
      RESOLVEFUNC(OPENSSL_sk_push)
-@@ -1073,7 +1077,15 @@ bool q_resolveOpenSslSymbols()
+@@ -1077,7 +1081,15 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(SSL_version)
      RESOLVEFUNC(SSL_get_error)
      RESOLVEFUNC(SSL_get_peer_cert_chain)
@@ -147,7 +147,7 @@ Last-Update: 2021-12-09
      RESOLVEFUNC(SSL_get_verify_result)
      RESOLVEFUNC(SSL_new)
      RESOLVEFUNC(SSL_get_SSL_CTX)
-@@ -1172,9 +1184,7 @@ bool q_resolveOpenSslSymbols()
+@@ -1176,9 +1188,7 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(DH_free)
      RESOLVEFUNC(d2i_DHparams)
      RESOLVEFUNC(i2d_DHparams)
diff --git a/debian/patches/xcb_add_a_timeout_control_when_reading_INCR_property.diff b/debian/patches/xcb_add_a_timeout_control_when_reading_INCR_property.diff
index 5b090a6..ff20bf4 100644
--- a/debian/patches/xcb_add_a_timeout_control_when_reading_INCR_property.diff
+++ b/debian/patches/xcb_add_a_timeout_control_when_reading_INCR_property.diff
@@ -28,7 +28,7 @@ Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
 
 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
 +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-@@ -829,6 +829,8 @@ QByteArray QXcbClipboard::clipboardReadI
+@@ -835,6 +835,8 @@ QByteArray QXcbClipboard::clipboardReadI
          alloc_error = buf.size() != nbytes+1;
      }
  
@@ -37,7 +37,7 @@ Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
      for (;;) {
          connection()->flush();
          xcb_generic_event_t *ge = waitForClipboardEvent(win, XCB_PROPERTY_NOTIFY);
-@@ -864,9 +866,11 @@ QByteArray QXcbClipboard::clipboardReadI
+@@ -870,9 +872,11 @@ QByteArray QXcbClipboard::clipboardReadI
                  tmp_buf.resize(0);
                  offset += length;
              }

