[neon/qt/qtwebengine/Neon/testing] debian: Drop two patches that are included in the new release.

[Dmitry Shachnev]

Git commit 36e966c2098020d4ed3c6aa0f8fad91bfc39ca95 by Dmitry Shachnev.
Committed on 20/11/2020 at 18:07.
Pushed by sitter into branch 'Neon/testing'.

Drop two patches that are included in the new release.

- webrtc-crash.patch
- compile-pdf-examples.patch

M  +3    -0    debian/changelog
D  +0    -82   debian/patches/compile-pdf-examples.patch
M  +0    -2    debian/patches/series
D  +0    -26   debian/patches/webrtc-crash.patch

https://invent.kde.org/neon/qt/qtwebengine/commit/36e966c2098020d4ed3c6aa0f8fad91bfc39ca95

diff --git a/debian/changelog b/debian/changelog
index 6b4ca45..364a54f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qtwebengine-opensource-src (5.15.2+dfsg-1) UNRELEASED; urgency=medium
   * Update debian/libqt5webenginecore5.symbols from buildds’ logs.
   * Bump Qt build-dependencies to 5.15.2.
   * Bump ABI version to qtwebengine-abi-5-15-2.
+  * Drop patches that are included in the new release:
+    - webrtc-crash.patch
+    - compile-pdf-examples.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Nov 2020 20:14:02 +0300
 
diff --git a/debian/patches/compile-pdf-examples.patch b/debian/patches/compile-pdf-examples.patch
deleted file mode 100644
index e815e90..0000000
--- a/debian/patches/compile-pdf-examples.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Compile pdf examples
- Fix typo in examples.pro and update related pro files.
-Origin: upstream, https://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=d8c7d966b1ca87ee
-Last-Update: 2020-10-06
-
---- a/examples/examples.pro
-+++ b/examples/examples.pro
-@@ -20,6 +20,6 @@ qtConfig(build-qtwebengine-core):qtConfi
- }
- 
- qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) {
--    SUDIRS += pdf
-+    SUBDIRS += pdf
-     qtConfig(pdf-widgets): SUBDIRS += pdfwidgets
- }
---- a/examples/pdf/multipage/main.cpp
-+++ b/examples/pdf/multipage/main.cpp
-@@ -48,7 +48,7 @@
- **
- ****************************************************************************/
- 
--#include <QApplication>
-+#include <QGuiApplication>
- #include <QQmlApplicationEngine>
- 
- int main(int argc, char* argv[])
-@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
-     QCoreApplication::setOrganizationName("QtProject");
-     QCoreApplication::setApplicationVersion(QT_VERSION_STR);
-     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
--    QApplication app(argc, argv);
-+    QGuiApplication app(argc, argv);
- 
-     QQmlApplicationEngine engine;
-     engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml")));
---- a/examples/pdf/multipage/multipage.pro
-+++ b/examples/pdf/multipage/multipage.pro
-@@ -1,6 +1,6 @@
- TEMPLATE = app
- 
--QT += qml quick pdf widgets svg
-+QT += qml quick pdf svg
- 
- SOURCES += main.cpp
- 
---- a/examples/pdf/pdf.pro
-+++ b/examples/pdf/pdf.pro
-@@ -1,3 +1,3 @@
- TEMPLATE=subdirs
- 
--SUBDIRS += pdfviewer multipage
-+qtHaveModule(svg): SUBDIRS += pdfviewer multipage
---- a/examples/pdf/pdfviewer/main.cpp
-+++ b/examples/pdf/pdfviewer/main.cpp
-@@ -48,7 +48,7 @@
- **
- ****************************************************************************/
- 
--#include <QApplication>
-+#include <QGuiApplication>
- #include <QQmlApplicationEngine>
- 
- int main(int argc, char* argv[])
-@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
-     QCoreApplication::setOrganizationName("QtProject");
-     QCoreApplication::setApplicationVersion(QT_VERSION_STR);
-     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
--    QApplication app(argc, argv);
-+    QGuiApplication app(argc, argv);
- 
-     QQmlApplicationEngine engine;
-     engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml")));
---- a/examples/pdf/pdfviewer/pdfviewer.pro
-+++ b/examples/pdf/pdfviewer/pdfviewer.pro
-@@ -1,6 +1,6 @@
- TEMPLATE = app
- 
--QT += qml quick pdf widgets svg
-+QT += qml quick pdf svg
- 
- SOURCES += main.cpp
- 
diff --git a/debian/patches/series b/debian/patches/series
index 19291d5..02ebedf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,3 @@ mipsel-no-dav1d.patch
 mipsel-link-atomic.patch
 sandbox-time64-syscalls.patch
 mipsel-code-range-size.patch
-webrtc-crash.patch
-compile-pdf-examples.patch
diff --git a/debian/patches/webrtc-crash.patch b/debian/patches/webrtc-crash.patch
deleted file mode 100644
index 989eba9..0000000
--- a/debian/patches/webrtc-crash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: avoid nullptr dereference in RTCPeerConnectionHandler
-Origin: upstream, https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=4e828b3bd2d41015
-Last-Update: 2020-10-02
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc
-@@ -2319,7 +2319,8 @@ void RTCPeerConnectionHandler::OnRemoveR
- 
- void RTCPeerConnectionHandler::OnModifySctpTransport(
-     blink::WebRTCSctpTransportSnapshot state) {
--  client_->DidModifySctpTransport(state);
-+  if (client_)
-+    client_->DidModifySctpTransport(state);
- }
- 
- void RTCPeerConnectionHandler::OnModifyTransceivers(
-@@ -2446,7 +2447,8 @@ void RTCPeerConnectionHandler::OnIceCand
- }
- 
- void RTCPeerConnectionHandler::OnInterestingUsage(int usage_pattern) {
--  client_->DidNoteInterestingUsage(usage_pattern);
-+  if (client_)
-+    client_->DidNoteInterestingUsage(usage_pattern);
- }
- 
- webrtc::SessionDescriptionInterface*