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 D5FDE13933E for ; Sat, 3 Jul 2021 14:44:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D1F4E0896; Sat, 3 Jul 2021 14:44:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 82D95E0896 for ; Sat, 3 Jul 2021 14:44:18 +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 49794335CE4 for ; Sat, 3 Jul 2021 14:44:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A9A967C1 for ; Sat, 3 Jul 2021 14:44:15 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1625323447.2c2ffc6b7f5f6117d81a954730f50d67d5c5db1e.asturm@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: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2c2ffc6b7f5f6117d81a954730f50d67d5c5db1e X-VCS-Branch: master Date: Sat, 3 Jul 2021 14:44:15 +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: 3d6dce51-7fbc-4f1f-af2f-75c3c36ba98f X-Archives-Hash: 1acf839620c7c77ac09ca3f0adbf63bc commit: 2c2ffc6b7f5f6117d81a954730f50d67d5c5db1e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 3 14:38:34 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 3 14:44:07 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2c2ffc6b dev-qt/qtwebengine: Sync with Gentoo ebuild repo Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 28 +++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild index a4468ac7..063e73c3 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild @@ -5,9 +5,10 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) QTVER=$(ver_cut 1-3) -inherit multiprocessing python-any-r1 qt5-build +inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" +HOMEPAGE="https://www.qt.io/" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" @@ -22,6 +23,7 @@ else "https://code.qt.io/qt/${QT5_MODULE}.git" "https://github.com/qt/${QT5_MODULE}.git" ) + inherit git-r3 fi # patchset based on https://github.com/chromium-ppc64le releases @@ -68,6 +70,7 @@ RDEPEND=" x11-libs/libXext x11-libs/libXfixes x11-libs/libXi + x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver @@ -78,15 +81,14 @@ RDEPEND=" kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) - system-icu? ( >=dev-libs/icu-68.2:= ) + system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( ~dev-qt/qtdeclarative-${QTVER}[widgets] ~dev-qt/qtwidgets-${QTVER} ) " DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} dev-util/gperf dev-util/ninja dev-util/re2c @@ -111,6 +113,24 @@ pkg_preinst() { elog "tldr: Your web browsing experience will be compromised." } +src_unpack() { + # bug 307861 + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + ewarn + ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." + ewarn "You may experience really long compilation times and/or increased memory usage." + ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." + ewarn + fi + eshopts_pop + + case ${QT5_BUILD_TYPE} in + live) git-r3_src_unpack ;& + release) default ;; + esac +} + src_prepare() { if [[ ${PV} == ${QTVER}_p* ]]; then # This is made from git, and for some reason will fail w/o .git directories.