diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py index 44b084392c..ed51c211f2 100755 --- a/desktop/toolkit/qt5/qt5-webengine/actions.py +++ b/desktop/toolkit/qt5/qt5-webengine/actions.py @@ -18,6 +18,7 @@ def setup(): shelltools.move("../qtwebengine-chromium-*", "src/3rdparty") shelltools.system("mkdir src/3rdparty/chromium/.git") #shelltools.system("patch -p1 < qtwebengine-5.15.7-build_fixes-1.patch") + shelltools.system("patch -p1 < qtwebengine-everywhere-src-5.15.5-TRUE.patch") shelltools.system("sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro") diff --git a/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-everywhere-src-5.15.5-TRUE.patch b/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-everywhere-src-5.15.5-TRUE.patch new file mode 100644 index 0000000000..b61c9233de --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-everywhere-src-5.15.5-TRUE.patch @@ -0,0 +1,12 @@ +diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c +--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE 2021-05-28 07:05:45.000000000 -0500 ++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2021-06-24 09:44:41.592468805 -0500 +@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler + #ifdef LIBXML_ICU_ENABLED + else if (handler->uconv_out != NULL) { + ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, +- TRUE); ++ 1); + } + #endif /* LIBXML_ICU_ENABLED */ + else { diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml index d143b6e355..493bc81ca8 100755 --- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml @@ -15,6 +15,7 @@ https://sourceforge.net/projects/pisilinux/files/source/qtwebengine-chromium-87-20220314.tar.xz/download qtwebengine-5.15.7-build_fixes-1.patch + qtwebengine-everywhere-src-5.15.5-TRUE.patch qt5-base-devel @@ -87,6 +88,7 @@ mit-kerberos-devel + @@ -134,6 +136,7 @@ harfbuzz libevent libXfixes + libXrandr fontconfig libXcursor libXScrnSaver