From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70C23138350 for ; Wed, 29 Jan 2020 01:53:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CA92E087F; Wed, 29 Jan 2020 01:53:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41F3FE087F for ; Wed, 29 Jan 2020 01:53:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CAD8F34E48B for ; Wed, 29 Jan 2020 01:53:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55C1DE5 for ; Wed, 29 Jan 2020 01:53:20 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1580262602.a154469e90074c7c027acc6ec75b000d24e6fdf1.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: a154469e90074c7c027acc6ec75b000d24e6fdf1 X-VCS-Branch: master Date: Wed, 29 Jan 2020 01:53:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2205ee23-a2b3-455d-8385-4a4880c07fd8 X-Archives-Hash: 6328f8d5980af8353c7b1aafa88fef5c commit: a154469e90074c7c027acc6ec75b000d24e6fdf1 Author: Jimi Huotari gentoo org> AuthorDate: Wed Jan 29 01:47:01 2020 +0000 Commit: Jimi Huotari gentoo 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 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 }