diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-11-30 10:28:27 +0000 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-11-30 11:30:30 +0000 |
| commit | cdedef82eff960ab808603c8ae29fff32af4b057 (patch) | |
| tree | 92a310ebee4b4ca2810e37976da60a5d43f5f461 | |
| parent | 94989d0eeefcc5c5acee678b2a8e01281721b38a (diff) | |
Revert "webengine: add patch for python 3.11 build issue"
This reverts commit 2495915e3a3abe7adb55b9433f468e04531dbe17.
Reason for revert: Included in upstream chromium with latest submodule update
Change-Id: I0d64185e1e5cb6aa181c18d4b758c4ca9e616395
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt6/qtwebengine.inc | 1 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch | 50 |
2 files changed, 0 insertions, 51 deletions
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 3efc196..c62bd3f 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -36,7 +36,6 @@ SRC_URI += " \ SRC_URI += " \ file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ - file://chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch;patchdir=src/3rdparty \ " SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium" diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch deleted file mode 100644 index 9ab3787..0000000 --- a/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a0cabac19789a4e88c86407970ea3b3d2929006b Mon Sep 17 00:00:00 2001 -From: Joanmarie Diggs <jdiggs@igalia.com> -Date: Tue, 30 Aug 2022 06:00:13 +0000 -Subject: [PATCH] Fix build in Python 3.11 (invalid mode: 'rU') - -In Python 3.11, 'U' ("universal newline") is no longer accepted in -the file mode, having been deprecated in Python 3.3. The "universal -newline" is used by default when a file is open in text mode. - -This commit removes the 'U' from the two (non-third-party) places -it is used. - -Bug: 1357549 -Change-Id: I3305707858d8ba7a9f518656a9b97dc1702bbe94 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3859535 -Reviewed-by: Mike Pinkerton <pinkerton@chromium.org> -Commit-Queue: Joanmarie Diggs <jdiggs@igalia.com> -Reviewed-by: Nico Weber <thakis@chromium.org> -Cr-Commit-Position: refs/heads/main@{#1040794} ---- - chromium/PRESUBMIT_test_mocks.py | 2 +- - chromium/tools/grit/grit/util.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/chromium/PRESUBMIT_test_mocks.py b/chromium/PRESUBMIT_test_mocks.py -index b7d1b482c5f..7304697b117 100644 ---- a/chromium/PRESUBMIT_test_mocks.py -+++ b/chromium/PRESUBMIT_test_mocks.py -@@ -128,7 +128,7 @@ class MockInputApi(object): - def PresubmitLocalPath(self): - return self.presubmit_local_path - -- def ReadFile(self, filename, mode='rU'): -+ def ReadFile(self, filename, mode='r'): - if hasattr(filename, 'AbsoluteLocalPath'): - filename = filename.AbsoluteLocalPath() - for file_ in self.files: -diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py -index 98433d154c0..98e770b8533 100644 ---- a/chromium/tools/grit/grit/util.py -+++ b/chromium/tools/grit/grit/util.py -@@ -209,7 +209,7 @@ def ReadFile(filename, encoding): - mode = 'rb' - encoding = None - else: -- mode = 'rU' -+ mode = 'r' - - with io.open(filename, mode, encoding=encoding) as f: - return f.read() |