From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3C84859CAF for ; Fri, 1 Apr 2016 15:26:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2682B21C001; Fri, 1 Apr 2016 15:26:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7C6821C001 for ; Fri, 1 Apr 2016 15:26:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADC2C340E23 for ; Fri, 1 Apr 2016 15:26:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 292577A for ; Fri, 1 Apr 2016 15:26:00 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1459524351.e9c83fdc1a992d599593e963f44ef44dccfa4090.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e9c83fdc1a992d599593e963f44ef44dccfa4090 X-VCS-Branch: master Date: Fri, 1 Apr 2016 15:26:00 +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-Archives-Salt: 7ad3c240-c767-480c-8402-28fd55b3290c X-Archives-Hash: e0fd5299dfddc4d3a1fa5f0cafe4a84f commit: e9c83fdc1a992d599593e963f44ef44dccfa4090 Author: Michael Palimaka gentoo org> AuthorDate: Fri Apr 1 15:25:23 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Apr 1 15:25:51 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e9c83fdc dev-qt/qtwebkit: manually run syncqt.pl to solve build failure This is normally done by upstream before creating the release tarball, but they forgot. Gentoo-bug: 577574 Package-Manager: portage-2.2.28 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild | 5 ++++- dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild index 58876f1..a3a0f0f 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build +inherit python-any-r1 qmake-utils qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz" @@ -105,5 +105,8 @@ src_prepare() { # bug 458222 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die + # bug 577574 + "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile + qt5-build_src_prepare } diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild index 6f84eba..8a1ac2e 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build +inherit python-any-r1 qmake-utils qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" @@ -104,5 +104,8 @@ src_prepare() { # bug 458222 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die + # bug 577574 + "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile + qt5-build_src_prepare }