Commit 72ddf631 authored by Bart Ribbers's avatar Bart Ribbers Committed by Rasmus Thomsen
Browse files

community/qt5-qtwebengine: restore core functionality

Qt 5.15.1 introduced a new check to see if glibc is available and if not
cripples functionality. However, it works fine with Musl and there is no
need to disable it. I missed this in the last upgrade, let's restore
functionality
parent b39024ec
Pipeline #47723 failed with stages
in 46 seconds
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=qt5-qtwebengine
pkgver=5.15.1
pkgrel=0
pkgrel=1
pkgdesc="Qt5 - QtWebEngine components"
url="https://www.qt.io/developers/"
# ppc64le and s390x are not supported
......@@ -88,11 +88,11 @@ source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtwebeng
nasm.patch
musl-hacks.patch
sandbox-sched_getparam.patch
remove-glibc-check.patch
"
builddir="$srcdir/qtwebengine-everywhere-src-$pkgver"
build() {
export NINJA_PATH="/usr/bin/ninja"
qmake-qt5 QMAKE_EXTRA_ARGS+="-system-ffmpeg -system-opus -system-webp"
make
}
......@@ -128,4 +128,5 @@ dec69ea8dd9cfa2973264ec405092d364513bbd47303a94c128d873a3de7294760340f3ad31753e6
f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch
9add958caa0d6acb2866d3927aadfa6b378c92d62463f1b3d65ae1e5400915d89388ac54beb30c4d4d42d2901ee28f404d8574b771854556f6a75698301870eb nasm.patch
b99eaa4a0b06ab1cb461fc4bfc7416c779ba1e847614b96f08de97a137a09577ea642813e5e3235167ccc5180c6ffcc06ebf2a61e3b4c210de9dee765e0e7404 musl-hacks.patch
dbe606be93377f094c6a1ab0358ae042f3e7aff95c635b07ebc04aa3173f7221a478fd544e8347152a4ca125a837d6da774929423868d5c9d5bd6165bdd1ba6d sandbox-sched_getparam.patch"
dbe606be93377f094c6a1ab0358ae042f3e7aff95c635b07ebc04aa3173f7221a478fd544e8347152a4ca125a837d6da774929423868d5c9d5bd6165bdd1ba6d sandbox-sched_getparam.patch
7153ce7372fed73dccb676079bc5af37f56be113f42ee64ed48cd7997dc2a4aa287523f36f0b8d3c717f1c4ad7f796843850b86a2dce50de5f0ade6a47785bee remove-glibc-check.patch"
Qt checks if glibc is available and if not disables large part of Qt5WebEngine and thus cripples functionality.
However these parts work fine with Musl so there is no need to disable them.
Just remove the check so it builds again. Since 5.15.1 is the last version of Qt to be released with this build system it'll be obsolete with Qt6 and there is no real point in fixing this upstream.
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 1ca6214a..3783c223 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -375,8 +375,7 @@
&& features.webengine-python2
&& (!config.sanitizer || features.webengine-sanitizer)
&& (!config.linux || features.pkg-config)
- && (!config.linux || features.webengine-host-pkg-config)
- && (!config.linux || features.webengine-system-glibc)
+ && (!config.linux || features.webengine-host-pkg-config)
&& (!config.linux || features.webengine-system-khr)
&& (!config.linux || features.webengine-system-nss)
&& (!config.linux || features.webengine-system-dbus)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment