Use Python 3 and bundled re2
Re2 was used bundled anyway and just copying header files from system doesn't actually change anything, except that it breaks when there is an API change.
This commit is contained in:
parent
e5457a1795
commit
fd03f499cd
7 changed files with 113 additions and 73 deletions
58
python3.12-six.patch
Normal file
58
python3.12-six.patch
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
Patch-Source: https://sources.debian.org/data/main/q/qtwebengine-opensource-src/5.15.16+dfsg-3/debian/patches/python3.12-six.patch
|
||||
--
|
||||
Description: implement find_spec() for _SixMetaPathImporter
|
||||
Origin: upstream, https://github.com/benjaminp/six/commit/25916292d96f5f09
|
||||
Last-Update: 2024-03-17
|
||||
|
||||
--- a/src/3rdparty/chromium/third_party/protobuf/third_party/six/six.py
|
||||
+++ b/src/3rdparty/chromium/third_party/protobuf/third_party/six/six.py
|
||||
@@ -71,6 +71,11 @@ else:
|
||||
MAXSIZE = int((1 << 63) - 1)
|
||||
del X
|
||||
|
||||
+if PY34:
|
||||
+ from importlib.util import spec_from_loader
|
||||
+else:
|
||||
+ spec_from_loader = None
|
||||
+
|
||||
|
||||
def _add_doc(func, doc):
|
||||
"""Add documentation to a function."""
|
||||
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
|
||||
return self
|
||||
return None
|
||||
|
||||
+ def find_spec(self, fullname, path, target=None):
|
||||
+ if fullname in self.known_modules:
|
||||
+ return spec_from_loader(fullname, self)
|
||||
+ return None
|
||||
+
|
||||
def __get_module(self, fullname):
|
||||
try:
|
||||
return self.known_modules[fullname]
|
||||
--- a/src/3rdparty/chromium/tools/grit/third_party/six/__init__.py
|
||||
+++ b/src/3rdparty/chromium/tools/grit/third_party/six/__init__.py
|
||||
@@ -71,6 +71,11 @@ else:
|
||||
MAXSIZE = int((1 << 63) - 1)
|
||||
del X
|
||||
|
||||
+if PY34:
|
||||
+ from importlib.util import spec_from_loader
|
||||
+else:
|
||||
+ spec_from_loader = None
|
||||
+
|
||||
|
||||
def _add_doc(func, doc):
|
||||
"""Add documentation to a function."""
|
||||
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
|
||||
return self
|
||||
return None
|
||||
|
||||
+ def find_spec(self, fullname, path, target=None):
|
||||
+ if fullname in self.known_modules:
|
||||
+ return spec_from_loader(fullname, self)
|
||||
+ return None
|
||||
+
|
||||
def __get_module(self, fullname):
|
||||
try:
|
||||
return self.known_modules[fullname]
|
||||
Loading…
Add table
Add a link
Reference in a new issue