[neon/qt/qtbase/Neon/release] debian: Remove reverse-applicable upstream patches.

[Simon Quigley]

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

Remove reverse-applicable upstream patches.

M  +3    -0    debian/changelog
D  +0    -84   debian/patches/CVE-2021-38593.diff
D  +0    -15   debian/patches/gcc_11_limits.diff
M  +0    -2    debian/patches/series

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

diff --git a/debian/changelog b/debian/changelog
index ef9b430..3b690ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtbase-opensource-src (5.15.5+dfsg-1) UNRELEASED; urgency=medium
 
   [ Simon Quigley ]
   * New upstream release.
+  * Remove reverse-applicable upstream patches:
+    - gcc_11_limits.diff
+    - CVE-2021-38593.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Jun 2022 19:52:14 -0500
 
diff --git a/debian/patches/CVE-2021-38593.diff b/debian/patches/CVE-2021-38593.diff
deleted file mode 100644
index 6f5d939..0000000
--- a/debian/patches/CVE-2021-38593.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: avoid processing-intensive painting of high number of tiny dashes
- When stroking a dashed path, an unnecessary amount of processing would
- be spent if there is a huge number of dashes visible, e.g. because of
- scaling. Since the dashes are too small to be individually visible
- anyway, just replace with a semi-transparent solid line for such
- cases.
-Origin: upstream, commits:
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f4d791b330d02777
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6b400e3147dcfd8c
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84aba80944a2e1c3
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=cca8ed0547405b1c
-Last-Update: 2021-11-27
-
---- a/src/gui/painting/qpaintengineex.cpp
-+++ b/src/gui/painting/qpaintengineex.cpp
-@@ -385,10 +385,10 @@ QPainterState *QPaintEngineEx::createSta
- 
- Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
- 
--void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
-+void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen)
- {
- #ifdef QT_DEBUG_DRAW
--    qDebug() << "QPaintEngineEx::stroke()" << pen;
-+    qDebug() << "QPaintEngineEx::stroke()" << inPen;
- #endif
- 
-     Q_D(QPaintEngineEx);
-@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVecto
-         d->stroker.setCubicToHook(qpaintengineex_cubicTo);
-     }
- 
-+    QRectF clipRect;
-+    QPen pen = inPen;
-+    if (pen.style() > Qt::SolidLine) {
-+        QRectF cpRect = path.controlPointRect();
-+        const QTransform &xf = state()->matrix;
-+        if (qt_pen_is_cosmetic(pen, state()->renderHints)) {
-+            clipRect = d->exDeviceRect;
-+            cpRect.translate(xf.dx(), xf.dy());
-+        } else {
-+            clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect));
-+        }
-+        // Check to avoid generating unwieldy amount of dashes that will not be visible anyway
-+        qreal pw = pen.widthF() ? pen.widthF() : 1;
-+        QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect;
-+        qreal extent = qMax(extentRect.width(), extentRect.height());
-+        qreal patternLength = 0;
-+        const QVector<qreal> pattern = pen.dashPattern();
-+        const int patternSize = qMin(pattern.size(), 32);
-+        for (int i = 0; i < patternSize; i++)
-+            patternLength += qMax(pattern.at(i), qreal(0));
-+        patternLength *= pw;
-+        if (qFuzzyIsNull(patternLength)) {
-+            pen.setStyle(Qt::NoPen);
-+        } else if (extent / patternLength > 10000) {
-+            // approximate stream of tiny dashes with semi-transparent solid line
-+            pen.setStyle(Qt::SolidLine);
-+            QColor color(pen.color());
-+            color.setAlpha(color.alpha() / 2);
-+            pen.setColor(color);
-+        }
-+    }
-+
-     if (!qpen_fast_equals(pen, d->strokerPen)) {
-         d->strokerPen = pen;
-         d->stroker.setJoinStyle(pen.joinStyle());
-@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVecto
-         return;
-     }
- 
--    if (pen.style() > Qt::SolidLine) {
--        if (qt_pen_is_cosmetic(pen, state()->renderHints)){
--            d->activeStroker->setClipRect(d->exDeviceRect);
--        } else {
--            QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect));
--            d->activeStroker->setClipRect(clipRect);
--        }
--    }
-+    if (!clipRect.isNull())
-+        d->activeStroker->setClipRect(clipRect);
- 
-     if (d->activeStroker == &d->stroker)
-         d->stroker.setForceOpen(path.hasExplicitOpen());
diff --git a/debian/patches/gcc_11_limits.diff b/debian/patches/gcc_11_limits.diff
deleted file mode 100644
index c254e12..0000000
--- a/debian/patches/gcc_11_limits.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-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 @@
- 
- #include <QtCore/qbytearray.h>
- 
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9d2fc3a..b062121 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # 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
@@ -9,7 +8,6 @@ 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
 moc_handle_include.diff