diff --git a/extra/qt6-webengine/.SRCINFO b/extra/qt6-webengine/.SRCINFO index 4792a51ef..67ccc277e 100644 --- a/extra/qt6-webengine/.SRCINFO +++ b/extra/qt6-webengine/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = qt6-webengine pkgdesc = Provides support for web applications using the Chromium browser project pkgver = 6.8.0 - pkgrel = 3 + pkgrel = 5 url = https://www.qt.io arch = x86_64 groups = qt6 @@ -14,6 +14,9 @@ pkgbase = qt6-webengine makedepends = gperf makedepends = jsoncpp makedepends = libepoxy + makedepends = libpulse + makedepends = libva + makedepends = libxcursor makedepends = ninja makedepends = nodejs makedepends = perf @@ -24,7 +27,6 @@ pkgbase = qt6-webengine depends = alsa-lib depends = dbus depends = expat - depends = ffmpeg depends = fontconfig depends = freetype2 depends = gcc-libs diff --git a/extra/qt6-webengine/PKGBUILD b/extra/qt6-webengine/PKGBUILD index 2e96b162d..e4f7a87e1 100644 --- a/extra/qt6-webengine/PKGBUILD +++ b/extra/qt6-webengine/PKGBUILD @@ -11,7 +11,7 @@ highmem=1 pkgname=qt6-webengine _pkgver=6.8.0 pkgver=6.8.0 -pkgrel=3 +pkgrel=5 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -19,7 +19,6 @@ pkgdesc='Provides support for web applications using the Chromium browser projec depends=(alsa-lib dbus expat - ffmpeg fontconfig freetype2 gcc-libs @@ -67,6 +66,9 @@ makedepends=(cmake gperf jsoncpp libepoxy + libpulse + libva + libxcursor ninja nodejs perf @@ -96,16 +98,18 @@ prepare() { export MAKEFLAGS="-j1" export ALARM_NINJA_JOBS="1" fi + sed -i 's/"-Wno-unused-function",/"-Wno-unused-function", "-Wno-incompatible-pointer-types",/' src/3rdparty/chromium/third_party/xnnpack/BUILD.gn cd "$srcdir/$_pkgfn/src/3rdparty" patch -p1 -i ${srcdir}/0001-ARM-toolchain-fixes.patch patch -p1 -i ${srcdir}/0002-Run-blink-bindings-generation-single-threaded.patch } build() { +# system ffmpeg disabled https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/issues/2 cmake -B build -S $_pkgfn -G Ninja \ -DCMAKE_MESSAGE_LOG_LEVEL=STATUS \ -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \ - -DQT_FEATURE_webengine_system_ffmpeg=ON \ + -DQT_FEATURE_webengine_system_ffmpeg=OFF \ -DQT_FEATURE_webengine_system_icu=ON \ -DQT_FEATURE_webengine_system_libevent=ON \ -DQT_FEATURE_webengine_system_re2=ON \