<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bd74ed1004ac67d7e63dc0f2dee912959d5b37d7">https://github.com/macports/macports-ports/commit/bd74ed1004ac67d7e63dc0f2dee912959d5b37d7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bd74ed1004ac67d7e63dc0f2dee912959d5b37d7
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Jan 17 13:32:56 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine-gn: new subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine, qt5-qtwebengine-docs: build using qt5-qtwebengine-gn
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes arm64 build of qt5-qtwebengine-docs
</span>---
aqua/qt5/Portfile | 36 ++++++++---
.../files/patch-qtwebengine_gn_binary_path.diff | 37 +++++++++++
.../files/patch-qtwebengine_gn_verbose_build.diff | 13 ----
devel/gn-devel/Portfile | 73 ++++++++++++++++++++++
.../files/patch-qtwebengine_gn_host_cpu_arm64.diff | 0
5 files changed, 139 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6913e84586..d1943dc913a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +85,9 @@ if { ${subport} in [list "${name}-qtwebengine" "${name}-qtwebengine-docs"] } {
</span> # Using system ninja: no need to extract bundled ninja
extract.post_args-append --exclude=${distname}/ninja/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Using separately-built GN: no need to extract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.post_args-append --exclude=${distname}/gn/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
ui_debug "delete ${worksrcpath}/src/3rdparty"
delete ${worksrcpath}/src/3rdparty
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -671,7 +674,7 @@ array set modules {
</span> }
qtwebengine {
{}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:python27 port:py27-ply path:bin/ninja:ninja port:gperf port:bison port:flex"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python27 port:py27-ply path:bin/ninja:ninja port:gperf port:bison port:flex port:qt5-qtwebengine-gn"
</span> "port:fontconfig port:dbus path:lib/pkgconfig/harfbuzz.pc:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 port:jsoncpp port:protobuf3-cpp port:poppler port:pulseaudio port:icu path:lib/libavcodec.dylib:ffmpeg port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
"qtdeclarative qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools"
{"Qt WebEngine"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1748,12 +1751,6 @@ foreach {module module_info} [array get modules] {
</span> | /usr/bin/patch -p0"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # build bundled GN verbosely
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_gn_verbose_build.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid "unknown current_cpu arm" build error on arm64 due to old bundled GN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_gn_host_cpu_arm64.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # avoid build issues on arm64:
# warning: 'memcpy' will always overflow; destination buffer has size 2, but size argument is 8 [-Wfortify-source]
# error: functional-style cast from 'neon_and_crc32::F' (aka 'V<float>') to '__fp16' is not allowed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1778,6 +1775,23 @@ foreach {module module_info} [array get modules] {
</span> configure.post_args-delete \
-webengine-native-spellchecker
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GN bundled with qtwebengine-chromium has Qt-specific additions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To avoid building the bundled GN from scratch when building qtwebengine,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the bundled GN is built separately as the qt5-qtwebengine-gn port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and qtwebengine is patched to build using the separately-built GN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These steps are duplicated in special case for qt5-qtwebengine-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_gn_binary_path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@GN_BINARY@@|${qt_bins_dir}/gn-qtwebengine5.15|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pri \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/core/gn_run.pro \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/pdf/gn_run.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # override `"autoDetect": "false"` in src/buildtools/configure.json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -feature-webengine-system-gn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # do not depend on commercial LTS release version, as described in
# https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
# based on example in Arch Linux: https://git.io/JMScA
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1916,6 +1930,14 @@ foreach {module module_info} [array get modules] {
</span> configure.args-append QMAKE_LINK=${configure.cxx}
# see https://trac.macports.org/ticket/59294
use_xcode yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use bundled GN from separately-built qt5-qtwebengine-gn port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Duplicated from special case for qt5-qtwebengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_gn_binary_path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@@GN_BINARY@@|${qt_bins_dir}/gn-qtwebengine5.15|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pri src/core/gn_run.pro src/pdf/gn_run.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -- -feature-webengine-system-gn
</span> } elseif { ${module} eq "qtwebkit" } {
# avoid: Project ERROR: Could not find feature mirclient.
patchfiles-append patch-qtwebkit_fix_mirclient_test.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_gn_binary_path.diff b/aqua/qt5/files/patch-qtwebengine_gn_binary_path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8be5cba7512
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_gn_binary_path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.pri.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,9 +171,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(qtConfTest_detectGn) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gn = $$qtConfFindInPath("gn$$EXE_SUFFIX")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gn = "@@GN_BINARY@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !isEmpty(gn) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qtRunLoggedCommand("$$gn --version", version)|return(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #bundled GN does not print version info, print something else instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qtRunLoggedCommand("$$gn --nocolor help switches", version)|return(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #accept all for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contains(version, ".*"): return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtLog("Gn version too old")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/gn_run.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/gn_run.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_TOOL_ENV =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_pass|!debug_and_release {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gn_binary = gn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gn_binary = "@@GN_BINARY@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runninja.target = run_ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pdf/gn_run.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pdf/gn_run.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_TOOL_ENV =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_pass|!debug_and_release {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gn_binary = gn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gn_binary = "@@GN_BINARY@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runninja.target = run_ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_gn_verbose_build.diff b/aqua/qt5/files/patch-qtwebengine_gn_verbose_build.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37ca93f1372..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_gn_verbose_build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/buildtools/gn.pro src/buildtools/gn.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 033202e..9c2bd60 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/buildtools/gn.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/buildtools/gn.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@ build_pass|!debug_and_release {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !system("$$pythonPathForSystem() $$gn_configure") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error("GN generation error!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- !system("cd $$system_quote($$system_path($$out_path)) && $$ninja_path $$basename(out)" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !system("cd $$system_quote($$system_path($$out_path)) && $$ninja_path -v $$basename(out)" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error("GN build error!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gn-devel/Portfile b/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 82b63dbd124..8cd8262f258 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,6 +13,14 @@ description meta-build system for Ninja
</span> long_description GN is a meta-build system that generates build files for Ninja.
homepage https://gn.googlesource.com/gn
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport qt5-qtwebengine-gn {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20201210
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {*}${description} (for building qtwebengine)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${long_description} This port is for building qt5-qtwebengine \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as it contains Qt-specific additions to GN.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq ${name}} {
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +37,71 @@ if {${subport} eq ${name}} {
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} eq "qt5-qtwebengine-gn"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compiler_wrapper 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Unless this port is useful for building earlier qtwebengine versions on older macOS...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} is for building qt5-qtwebengine, which requires macOS 10.13 or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "unsupported macOS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fetch archives generated by GitHub mirrors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use same ref as qt5-qtwebengine to reuse distfile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # even though bundled GN has not been updated since 5.15.3 (0d0da86)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/qt/qtwebengine-chromium/commits/87-based/gn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref d505a379d3b1bd92d15c5a7051c3ed7b83743424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.type standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist_subdir qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname qtwebengine-chromium-${qtwebengine_chromium_ref}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://github.com/qt/qtwebengine-chromium/archive/${qtwebengine_chromium_ref}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 90cf613a0d96297bb4f1373287f22f9900cfedba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a6c578f7feec67b090fd10e1462590ce6d2182b4e889f2f92a5fde5acbf84d38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462445254
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Just extract gn; do not extract all of chromium (~2GB) or ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${distname}/gn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.post_args-append ${worksrcdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Backport change to avoid "unknown current_cpu arm" build error on arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_gn_host_cpu_arm64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/qt/qtwebengine/blob/v5.15.8-lts/src/buildtools/gn.pro#L21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-last-commit-position \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --use-lto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --isysroot ${configure.sdkroot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --cc [compwrap::wrap_compiler cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --cxx [compwrap::wrap_compiler cxx] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ld [compwrap::wrap_compiler cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not conflict with other gn binaries:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add suffix and install to Qt5-specific location not in PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/out/gn ${worksrcpath}/out/gn-qtwebengine5.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see qt_bins_dir definition in PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_bins_dir ${prefix}/libexec/qt5/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${qt_bins_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/out/gn-qtwebengine5.15 ${destroot}${qt_bins_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tests currently do not compile: some misplaced files and compilation errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (reported: https://bugreports.qt.io/browse/QTBUG-99682), as well as dependency on googletest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Does not affect building qt5-qtwebengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run no
</span> }
set python_branch 3.10
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_gn_host_cpu_arm64.diff b/devel/gn-devel/files/patch-qtwebengine_gn_host_cpu_arm64.diff
</span>similarity index 100%
rename from aqua/qt5/files/patch-qtwebengine_gn_host_cpu_arm64.diff
rename to devel/gn-devel/files/patch-qtwebengine_gn_host_cpu_arm64.diff
</pre><pre style='margin:0'>
</pre>