From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1043899-garchives=archives.gentoo.org@lists.gentoo.org>
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 CDCDC138334
for <garchives@archives.gentoo.org>; Sat, 25 Aug 2018 04:04:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9EEB1E079E;
Sat, 25 Aug 2018 04:04:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 5B6C7E079E
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Aug 2018 04:04:37 +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 6F5F2335C7F
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Aug 2018 04:04:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9154E37C
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Aug 2018 04:04:33 +0000 (UTC)
From: "Jimi Huotari" <chiitoo@gentoo.org>
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" <chiitoo@gentoo.org>
Message-ID: <1535169732.76a2bab7c21e18325253b17ed31ca34cb5f4bf22.chiitoo@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
X-VCS-Repository: proj/qt
X-VCS-Files: dev-qt/qtwebengine/metadata.xml dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
X-VCS-Directories: dev-qt/qtwebengine/
X-VCS-Committer: chiitoo
X-VCS-Committer-Name: Jimi Huotari
X-VCS-Revision: 76a2bab7c21e18325253b17ed31ca34cb5f4bf22
X-VCS-Branch: master
Date: Sat, 25 Aug 2018 04:04:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 29074748-0d4b-44ef-9739-57118082d3d6
X-Archives-Hash: f7a888c29573cf4adbd59ccd840093e5
commit: 76a2bab7c21e18325253b17ed31ca34cb5f4bf22
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 04:01:57 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 04:02:12 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=76a2bab7
dev-qt/qtwebengine: add USE="jumbo-build"
Allows for disabling 'jumbo-build' completely to reduce memory use.
Bug: https://bugs.gentoo.org/660430
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 8 +++++++-
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 8 +++++++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 +++++++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index cd7c273b..acca7340 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -10,6 +10,7 @@
<pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="jumbo-build">Combine source files to speed up build process.</flag>
<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
instead of bundled.</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index c3b6285f..61f119f9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -86,6 +87,11 @@ PATCHES+=(
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ if ! use jumbo-build; then
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+ src/core/config/common.pri || die
+ fi
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 7b506cba..3b0d387a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -83,6 +84,11 @@ PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ if ! use jumbo-build; then
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+ src/core/config/common.pri || die
+ fi
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7b506cba..3b0d387a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -83,6 +84,11 @@ PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ if ! use jumbo-build; then
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+ src/core/config/common.pri || die
+ fi
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die