qt5-qtwebengine sync with qt5-qtbase
This commit is contained in:
Adam Ciarciński
parent
e8b4a76e1c
commit
b0b592be22
|
|
@ -27,8 +27,10 @@ LDFLAGS+= -Wl,-no-keep-memory -Wl-reduce-memory
|
|||
.endif
|
||||
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/icu/android/patch_locale.sh
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/icu/cast/patch_locale.sh
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/icu/source/configure
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/protobuf/post_process_dist.sh
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/sqlite/src/configure
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/buildit/build_llvm
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal
|
||||
CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal.in
|
||||
|
|
@ -56,13 +58,13 @@ post-install:
|
|||
.include "../../devel/nss/buildlink3.mk"
|
||||
.include "../../devel/snappy/buildlink3.mk"
|
||||
.include "../../graphics/libwebp/buildlink3.mk"
|
||||
.include "../../multimedia/ffmpeg3/buildlink3.mk"
|
||||
.include "../../multimedia/ffmpeg4/buildlink3.mk"
|
||||
.include "../../multimedia/libvpx/buildlink3.mk"
|
||||
.include "../../textproc/icu/buildlink3.mk"
|
||||
.include "../../textproc/libxslt/buildlink3.mk"
|
||||
.if ${OPSYS} != "Darwin"
|
||||
# alsa pulseaudio
|
||||
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
|
||||
.include "../../textproc/icu/buildlink3.mk"
|
||||
.include "../../x11/libXcomposite/buildlink3.mk"
|
||||
.include "../../x11/libXScrnSaver/buildlink3.mk"
|
||||
.endif
|
||||
|
|
@ -77,4 +79,5 @@ PYTHON_VERSIONS_ACCEPTED= 27
|
|||
#.include "../../lang/ruby/buildlink3.mk"
|
||||
#BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
|
||||
.include "../../mk/curses.buildlink3.mk"
|
||||
.include "../../mk/jpeg.buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1 +1,3 @@
|
|||
@comment $NetBSD$
|
||||
lib/pkgconfig/Qt5WebEngine.pc
|
||||
lib/pkgconfig/Qt5WebEngineWidgets.pc
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.9 2017/04/26 10:27:43 wiz Exp $
|
||||
|
||||
SHA1 (qtwebengine-everywhere-src-5.11.1.tar.xz) = cbea98f39b064ad4f656b76086f88d5ee5269f75
|
||||
RMD160 (qtwebengine-everywhere-src-5.11.1.tar.xz) = 783d24997f0a802fc2763cf3f183672fad79e84a
|
||||
SHA512 (qtwebengine-everywhere-src-5.11.1.tar.xz) = 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
|
||||
Size (qtwebengine-everywhere-src-5.11.1.tar.xz) = 233633572 bytes
|
||||
SHA1 (patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn) = a8f779d78d8e5ea22c60851d0ec724b356a28e34
|
||||
SHA1 (patch-src_3rdparty_chromium_tools_gn_bootstrap_build_mac.ninja.template) = 637fa297a90b33f22e13e5f692f4841ed3b45a2d
|
||||
SHA1 (qtwebengine-everywhere-src-5.12.3.tar.xz) = 124f0b285d5ea56dabfcbc6b6e190800dd0f7995
|
||||
RMD160 (qtwebengine-everywhere-src-5.12.3.tar.xz) = df2468bd8bc486c1a419c9f175c7b750e5005973
|
||||
SHA512 (qtwebengine-everywhere-src-5.12.3.tar.xz) = 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
|
||||
Size (qtwebengine-everywhere-src-5.12.3.tar.xz) = 249275648 bytes
|
||||
SHA1 (patch-mkspecs_features_platform.prf) = 55733f4af349c7922663d51555c4699a37ea407b
|
||||
SHA1 (patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn) = bccf18157158105130e1d1452ab6851476926ac7
|
||||
SHA1 (patch-src_3rdparty_gn_build_build_mac.ninja.template) = 0abc7a94ddc1006d3bcdf15e1a57b925f274a8dd
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
$NetBSD$
|
||||
|
||||
--- mkspecs/features/platform.prf.orig 2019-06-17 15:45:18.000000000 +0000
|
||||
+++ mkspecs/features/platform.prf
|
||||
@@ -11,56 +11,11 @@ defineTest(isQtMinimum) {
|
||||
|
||||
defineTest(isPlatformSupported) {
|
||||
QT_FOR_CONFIG += gui-private
|
||||
- linux {
|
||||
if(!gcc:!clang)|intel_icc {
|
||||
- skipBuild("Qt WebEngine on Linux requires clang or GCC.")
|
||||
+ skipBuild("Qt WebEngine requires clang or GCC.")
|
||||
return(false)
|
||||
}
|
||||
gcc:!clang:!isGCCVersionSupported(): return(false)
|
||||
- } else:win32 {
|
||||
- winrt {
|
||||
- skipBuild("WinRT is not supported.")
|
||||
- return(false)
|
||||
- }
|
||||
- isBuildingOnWin32() {
|
||||
- skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.")
|
||||
- }
|
||||
- !msvc|intel_icl {
|
||||
- skipBuild("Qt WebEngine on Windows requires MSVC.")
|
||||
- return(false)
|
||||
- }
|
||||
- !isMinWinSDKVersion(10, 16299): {
|
||||
- skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.16299 or newer.")
|
||||
- return(false)
|
||||
- }
|
||||
- !qtConfig(webengine-winversion) {
|
||||
- skipBuild("Needs Visual Studio 2017 or higher")
|
||||
- return(false)
|
||||
- }
|
||||
- } else:osx {
|
||||
- # FIXME: Try to get it back down to 8.2 for building on OS X 10.11
|
||||
- !isMinXcodeVersion(8, 3, 3) {
|
||||
- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.")
|
||||
- return(false)
|
||||
- }
|
||||
- !clang|intel_icc {
|
||||
- skipBuild("Qt WebEngine on macOS requires Clang.")
|
||||
- return(false)
|
||||
- }
|
||||
- # We require macOS 10.12 (darwin version 16.0.0) or newer.
|
||||
- darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
|
||||
- lessThan(darwin_major_version, 16) {
|
||||
- skipBuild("Building Qt WebEngine requires macOS version 10.12 or newer.")
|
||||
- return(false)
|
||||
- }
|
||||
- !isMinOSXSDKVersion(10, 12): {
|
||||
- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
|
||||
- return(false)
|
||||
- }
|
||||
- } else {
|
||||
- skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
|
||||
- return(false)
|
||||
- }
|
||||
|
||||
# QMAKE doesn't set c++14 for MSVC2017, so only test for gcc and clang (which pretends to be gcc)
|
||||
gcc:!contains(QT_CONFIG, c++14) {
|
||||
|
|
@ -2,14 +2,14 @@ $NetBSD$
|
|||
|
||||
Use system libtool; avoid picking devel/libtool-base.
|
||||
|
||||
--- src/3rdparty/chromium/build/toolchain/mac/BUILD.gn.orig 2017-06-10 18:43:04.000000000 +0000
|
||||
--- src/3rdparty/chromium/build/toolchain/mac/BUILD.gn.orig 2019-04-04 15:55:59.000000000 +0000
|
||||
+++ src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
|
||||
@@ -218,7 +218,7 @@ template("mac_toolchain") {
|
||||
tool("alink") {
|
||||
script =
|
||||
rebase_path("//build/toolchain/mac/filter_libtool.py", root_build_dir)
|
||||
- command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script libtool -static {{arflags}} -o {{output}} {{inputs}}"
|
||||
+ command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script /usr/bin/libtool -static {{arflags}} -o {{output}} {{inputs}}"
|
||||
@@ -247,7 +247,7 @@ template("mac_toolchain") {
|
||||
# corrupted by this process. Don't use spaces for source files or labels.
|
||||
rspfile = "{{output}}.rsp"
|
||||
rspfile_content = "{{inputs_newline}}"
|
||||
- command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script libtool -static {{arflags}} -o {{output}} -filelist $rspfile"
|
||||
+ command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script /usr/bin/libtool -static {{arflags}} -o {{output}} -filelist $rspfile"
|
||||
description = "LIBTOOL-STATIC {{output}}"
|
||||
outputs = [
|
||||
"{{output_dir}}/{{target_output_name}}{{output_extension}}",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD$
|
||||
|
||||
--- src/3rdparty/chromium/tools/gn/bootstrap/build_mac.ninja.template.orig 2017-06-09 20:18:47.000000000 +0000
|
||||
+++ src/3rdparty/chromium/tools/gn/bootstrap/build_mac.ninja.template
|
||||
--- src/3rdparty/gn/build/build_mac.ninja.template.orig 2017-06-09 20:18:47.000000000 +0000
|
||||
+++ src/3rdparty/gn/build/build_mac.ninja.template
|
||||
@@ -11,7 +11,7 @@ rule cxx
|
||||
deps = gcc
|
||||
|
||||
Loading…
Reference in New Issue