commit: a154469e90074c7c027acc6ec75b000d24e6fdf1
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 01:47:01 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 01:50:02 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a154469e
dev-qt/qtwebengine: [5.15] refactor configure options
The options should now be more robust, and depend less on automagic.
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 69228a43..e6a01a7d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -89,10 +89,6 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH
+= |&$$QTWEBENGINE_ROOT/include |' || die
- # Disable 'qtpdf' for now to fix build.
- sed -i -e 's|qtConfig(build-qtpdf)|false|g' \
- src/src.pro || die
-
qt_use_disable_config alsa webengine-alsa
src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio
src/buildtools/config/linux.pri
@@ -109,14 +105,15 @@ src_configure() {
local myqmakeargs=(
--
- -opus
+ -no-build-qtpdf
-printing-and-pdf
- -webp
- $(usex alsa '-alsa' '')
- $(usex bindist '' '-proprietary-codecs')
- $(usex pulseaudio '-pulseaudio' '')
- $(usex system-ffmpeg '-ffmpeg' '')
- $(usex system-icu '-webengine-icu' '')
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-webengine-icu')
)
qt5-build_src_configure
}
