diff options
| author | Treeve Jelbert | 2022-11-17 08:50:29 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2022-11-17 08:50:45 +0100 |
| commit | b5da8c32e4bf24beb934d8ad427e5575ac886145 (patch) | |
| tree | 250334e993954facf2a57e4299da060e075f97bd /qt6 | |
| parent | 36b63f15526b792b0c011c69498f027509738ef9 (diff) | |
qt6webengine - fix build
Diffstat (limited to 'qt6')
| -rw-r--r-- | qt6/qt6webengine/HISTORY | 3 | ||||
| -rwxr-xr-x | qt6/qt6webengine/PRE_BUILD | 5 | ||||
| -rw-r--r-- | qt6/qt6webengine/chrome-patches/grit.patch | 23 |
3 files changed, 30 insertions, 1 deletions
diff --git a/qt6/qt6webengine/HISTORY b/qt6/qt6webengine/HISTORY index 3dbb0f7673..4b028c2154 100644 --- a/qt6/qt6webengine/HISTORY +++ b/qt6/qt6webengine/HISTORY @@ -1,3 +1,6 @@ +2022-11-16 Treeve Jelbert <treeve@sourcemage.org> + * PRE_BUILD chrome-patches: fix build with python-3.11 - upstream patch + 2022-11-15 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 6.4.1 diff --git a/qt6/qt6webengine/PRE_BUILD b/qt6/qt6webengine/PRE_BUILD index 4604ffcd89..66e8d8465d 100755 --- a/qt6/qt6webengine/PRE_BUILD +++ b/qt6/qt6webengine/PRE_BUILD @@ -1,3 +1,6 @@ default_pre_build && cd $SOURCE_DIRECTORY && -apply_patch_dir patches +apply_patch_dir patches && +cd src/3rdparty && +apply_patch_dir chrome-patches && +cd $SOURCE_DIRECTORY diff --git a/qt6/qt6webengine/chrome-patches/grit.patch b/qt6/qt6webengine/chrome-patches/grit.patch new file mode 100644 index 0000000000..5ac50b3452 --- /dev/null +++ b/qt6/qt6webengine/chrome-patches/grit.patch @@ -0,0 +1,23 @@ +--- 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() +--- a/chromium/PRESUBMIT_test_mocks.py ++++ b/chromium/PRESUBMIT_test_mocks.py +@@ -129,7 +129,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: + |