diff --git a/libs/qt5/qtwebengine/0001-Fix-building-GN-with-VS-2019.patch b/libs/qt5/qtwebengine/0001-Fix-building-GN-with-VS-2019.patch new file mode 100644 index 00000000..c8ee8a54 --- /dev/null +++ b/libs/qt5/qtwebengine/0001-Fix-building-GN-with-VS-2019.patch @@ -0,0 +1,30 @@ +From 4c061bfd83c823eaae0e6bd6a9004e6b2909564b Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Wed, 17 Apr 2019 16:25:29 +0200 +Subject: [PATCH] Fix building GN with VS 2019 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Task-number: QTBUG-75212 +Change-Id: I04ecfbcd2bd947d5f497dbd406e5e6e70b849802 +Reviewed-by: Jüri Valdmann +--- + gn/tools/gn/substitution_writer.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/3rdparty/gn/tools/gn/substitution_writer.h b/src/3rdparty/gn/tools/gn/substitution_writer.h +index d5cb1c31bd..530f064769 100644 +--- a/src/3rdparty/gn/tools/gn/substitution_writer.h ++++ b/src/3rdparty/gn/tools/gn/substitution_writer.h +@@ -6,6 +6,7 @@ + #define TOOLS_GN_SUBSTITUTION_WRITER_H_ + + #include ++#include + #include + + #include "tools/gn/substitution_type.h" +-- +2.17.1 + diff --git a/libs/qt5/qtwebengine/qtwebengine.py b/libs/qt5/qtwebengine/qtwebengine.py index fa7ba551..85ddd5df 100644 --- a/libs/qt5/qtwebengine/qtwebengine.py +++ b/libs/qt5/qtwebengine/qtwebengine.py @@ -1,82 +1,84 @@ # -*- coding: utf-8 -*- import info class subinfo(info.infoclass): def registerOptions(self): # only supports msvc17+ if CraftCore.compiler.isMSVC() and CraftCore.compiler.getInternalVersion() < 15: self.parent.package.categoryInfo.compiler = CraftCore.compiler.Compiler.NoCompiler def setTargets(self): self.versionInfo.setDefaultValues() self.patchLevel["5.12.1"] = 2 + self.patchToApply["5.12.3"] = [("0001-Fix-building-GN-with-VS-2019.patch", 1)] + for ver in self.versionInfo.tarballs() + self.versionInfo.branches() + self.versionInfo.tags(): qtVer = CraftVersion(ver) if qtVer <= CraftVersion("5.9"): self.patchToApply[ver] = [("0001-Fix-the-detection-of-python2.exe.patch", 1)]#https://codereview.qt-project.org/#/c/203000/ def setDependencies(self): self.buildDependencies["dev-utils/gperf"] = None self.buildDependencies["dev-utils/flexbison"] = None self.buildDependencies["dev-utils/python2"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtlocation"] = None self.runtimeDependencies["libs/qt5/qtdeclarative"] = None self.runtimeDependencies["libs/qt5/qtwebchannel"] = None if not CraftCore.compiler.isWindows: self.runtimeDependencies["libs/lcms2"] = None self.runtimeDependencies["libs/freetype"] = None self.runtimeDependencies["libs/libopus"] = None self.runtimeDependencies["libs/zlib"] = None self.runtimeDependencies["libs/libxml2"] = None self.runtimeDependencies["libs/libxslt"] = None self.runtimeDependencies["libs/freetype"] = None self.runtimeDependencies["libs/fontconfig"] = None self.runtimeDependencies["libs/libjpeg-turbo"] = None self.runtimeDependencies["qt-libs/poppler"] = None self.runtimeDependencies["libs/webp"] = None self.runtimeDependencies["libs/ffmpeg"] = None from Package.Qt5CorePackageBase import * class QtPackage(Qt5CorePackageBase): def __init__(self, **args): Qt5CorePackageBase.__init__(self) self.subinfo.options.fetch.checkoutSubmodules = True if CraftCore.compiler.isLinux: self.subinfo.options.configure.args += " -- --webengine-pulseaudio=no --webengine-ffmpeg=system" def fetch(self): if isinstance(self, GitSource): utils.system(["git", "clean", "-xdf"], cwd=self.sourceDir()) return Qt5CorePackageBase.fetch(self) def compile(self): env = {} if CraftCore.compiler.isMacOS: # we need mac's version of libtool here env["PATH"] = f"/usr/bin/:{os.environ['PATH']}" if self.qtVer < CraftVersion("5.9") and CraftCore.compiler.isWindows: env["PATH"] = CraftCore.settings.get("Paths", "PYTHON27") + ";" + os.environ["PATH"] with utils.ScopedEnv(env): return Qt5CorePackageBase.compile(self) def install(self): if not Qt5CorePackageBase.install(self): return False if CraftCore.compiler.isWindows and os.path.isdir(os.path.join(self.imageDir(), "resources")): # apply solution for wrong install location of some important files # see: https://stackoverflow.com/a/35448081 utils.mergeTree(os.path.join(self.imageDir(), "resources"), os.path.join(self.imageDir(), "bin")) return True class Package(Qt5CoreSdkPackageBase): def __init__(self): Qt5CoreSdkPackageBase.__init__(self, classA=QtPackage, condition=not CraftCore.compiler.isMinGW())