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 B467113835A for ; Sun, 14 Mar 2021 15:36:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 058D0E0828; Sun, 14 Mar 2021 15:36:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 D3778E0828 for ; Sun, 14 Mar 2021 15:36:50 +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 0708E335D04 for ; Sun, 14 Mar 2021 15:36:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF38F579 for ; Sun, 14 Mar 2021 15:36:48 +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: <1615736116.8419ef9dd4ed9bf4be9feffa56f92d2165cfa0e2.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8419ef9dd4ed9bf4be9feffa56f92d2165cfa0e2 X-VCS-Branch: master Date: Sun, 14 Mar 2021 15:36:48 +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: 93fa7faa-8bab-44d1-b2f8-830f5e14aecb X-Archives-Hash: 5d009c0830c98037a8fefaefc050f40d commit: 8419ef9dd4ed9bf4be9feffa56f92d2165cfa0e2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 21 15:36:51 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 14 15:35:16 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8419ef9d dev-qt/qtwebengine: Sync with Gentoo ebuild repo Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtwebengine-5.15.2_p20210224-disable-git.patch | 15 +++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 15 +++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch new file mode 100644 index 00000000..c31e8970 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch @@ -0,0 +1,15 @@ +generate_gni.sh: update_readme() runs git at the end of process, prevent it. + +Thanks-to: Georgy Yakovlev + +--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-07 12:51:49.438514897 +0100 ++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-21 16:23:38.375724515 +0100 +@@ -519,8 +519,3 @@ + + gn format --in-place $BASE_DIR/BUILD.gn + gn format --in-place $BASE_DIR/libvpx_srcs.gni +- +-cd $BASE_DIR/$LIBVPX_SRC_DIR +-update_readme +- +-cd $BASE_DIR diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild index 98ede450..d2b9e762 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild @@ -21,7 +21,7 @@ fi # patchset based on https://github.com/chromium-ppc64le releases SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )" -IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -72,7 +72,7 @@ RDEPEND=" kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) - system-icu? ( >=dev-libs/icu-60.2:= ) + system-icu? ( >=dev-libs/icu-68.2:= ) widgets? ( ~dev-qt/qtdeclarative-${QTVER}[widgets] ~dev-qt/qtwidgets-${QTVER} @@ -88,7 +88,10 @@ DEPEND="${RDEPEND} sys-devel/bison " -PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446 +PATCHES=( + "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 + "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix +) src_prepare() { if [[ ${PV} == ${QTVER}_p* ]]; then @@ -100,7 +103,7 @@ src_prepare() { sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die fi - # QTBUG-88657 - jumbo-build is broken + # QTBUG-88657 - jumbo-build could still make trouble if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/buildtools/config/common.pri || die @@ -144,11 +147,7 @@ src_prepare() { mkdir -vp source/config/linux/ppc64 || die mkdir -p source/libvpx/test || die touch source/libvpx/test/test.mk || die - # generate_gni.sh runs git at the end of process, prevent it. - git() { : ; } - export -f git ./generate_gni.sh || die - unset git popd >/dev/null || die fi }