qt5-webengine: fix build

This commit is contained in:
suvari
2022-04-27 22:09:57 +03:00
parent ef13cbd4a8
commit c918b1ed42
3 changed files with 16 additions and 0 deletions
@@ -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")
@@ -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 {
@@ -15,6 +15,7 @@
<Archive sha1sum="bb9bee71b659abf5f7165ebfc8e956b5fceed4a9" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/qtwebengine-chromium-87-20220314.tar.xz/download</Archive>
<AdditionalFiles>
<AdditionalFile target="qtwebengine-5.15.7-build_fixes-1.patch" permission="0644">qtwebengine-5.15.7-build_fixes-1.patch</AdditionalFile>
<AdditionalFile target="qtwebengine-everywhere-src-5.15.5-TRUE.patch" permission="0644">qtwebengine-everywhere-src-5.15.5-TRUE.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
@@ -87,6 +88,7 @@
<Dependency>mit-kerberos-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qtwebengine-everywhere-src-5.15.5-TRUE.patch</Patch> -->
<!-- <Patch level="1">qtbug-86752.patch</Patch> -->
<!-- <Patch>fedora/qtwebengine-everywhere-opensource-src-5.15.5-TRUE.patch</Patch> -->
<!-- <Patch>qtwebengine-5.15.2_p20210220-fixup-CVE-2021-21149-backport.patch</Patch> -->
@@ -134,6 +136,7 @@
<Dependency>harfbuzz</Dependency>
<Dependency>libevent</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>libXrandr</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>libXcursor</Dependency>
<Dependency>libXScrnSaver</Dependency>