diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2023-11-17 14:09:21 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2024-03-22 11:57:56 +0000 |
| commit | 68302c9ea158fbc83cd28570a0560e5a892b45e8 (patch) | |
| tree | 08c0039e3f33730a05ca4ef2340641a67419c009 /chromium/build/android/gyp/java_cpp_enum.py | |
| parent | 38655f07d8ef13eb067e3a29bb3a0c2dc0b19716 (diff) | |
Enable building with Python 3
Port and fix up the patch used by the Debian project, see
https://salsa.debian.org/qt-kde-team/qt/qtwebengine/-/blob/0db62e47f0e2f5e4e00193b65da912fe0083088c/debian/patches/chromium-python3.patch which in turn was largely based on a patch from ArchLinux:
https://github.com/archlinux/svntogit-packages/blob/packages/qt5-webengine/trunk/qt5-webengine-chromium-python3.patch
Also contains upgrades of six and catapult to build with Python 3.11
and 3.12, plus some other additional fixes, e.g. for macOS builds.
Change-Id: I6b999505150495caabdcf05f6e4c7af588eff7ee
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/542809
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build/android/gyp/java_cpp_enum.py')
| -rwxr-xr-x | chromium/build/android/gyp/java_cpp_enum.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/build/android/gyp/java_cpp_enum.py b/chromium/build/android/gyp/java_cpp_enum.py index 0b9ee541e4e..5fd66b93b9e 100755 --- a/chromium/build/android/gyp/java_cpp_enum.py +++ b/chromium/build/android/gyp/java_cpp_enum.py @@ -186,8 +186,9 @@ class HeaderParser(object): enum_name_re = r'(\w+)' optional_fixed_type_re = r'(\:\s*(\w+\s*\w+?))?' enum_start_re = re.compile(r'^\s*(?:\[cpp.*\])?\s*enum\s+' + - optional_class_or_struct_re + '\s*' + enum_name_re + '\s*' + - optional_fixed_type_re + '\s*{\s*') + optional_class_or_struct_re + r'\s*' + + enum_name_re + r'\s*' + optional_fixed_type_re + + r'\s*{\s*') enum_single_line_re = re.compile( r'^\s*(?:\[cpp.*\])?\s*enum.*{(?P<enum_entries>.*)}.*$') |