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 D8ACD138334 for ; Tue, 24 Sep 2019 20:56:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF1EBE087B; Tue, 24 Sep 2019 20:55:59 +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 9EAC1E087B for ; Tue, 24 Sep 2019 20:55:59 +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 D7B1B34B455 for ; Tue, 24 Sep 2019 20:55:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 436AE772 for ; Tue, 24 Sep 2019 20:55:55 +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: <1569358383.dc9767944fa764ada23540868b675d190fae7c85.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.14.9999.ebuild 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: dc9767944fa764ada23540868b675d190fae7c85 X-VCS-Branch: master Date: Tue, 24 Sep 2019 20:55:55 +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: b5daa801-6fc2-4f14-b937-8ddecdbb30e0 X-Archives-Hash: dbcbd25a68b5035fb364e73fee1ea469 commit: dc9767944fa764ada23540868b675d190fae7c85 Author: Jimi Huotari gentoo org> AuthorDate: Tue Sep 24 20:44:51 2019 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Tue Sep 24 20:53:03 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dc976794 dev-qt/qtwebengine: update the location of configuration files Upstream has changed the location of the "gn configs" [1] in the 5.14 and 5.15 branches. 1. https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=5.14&id=19a73086 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 6 +++--- dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild index 20cbb0c2..433f331e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild @@ -83,17 +83,17 @@ src_prepare() { if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ - src/core/config/common.pri || die + src/buildtools/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 - qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri + qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri qt_use_disable_config geolocation webengine-geolocation \ src/core/core_chromium.pri \ src/core/core_common.pri - qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri + qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild index 20cbb0c2..433f331e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild @@ -83,17 +83,17 @@ src_prepare() { if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ - src/core/config/common.pri || die + src/buildtools/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 - qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri + qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri qt_use_disable_config geolocation webengine-geolocation \ src/core/core_chromium.pri \ src/core/core_common.pri - qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri + qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro