Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/
Date: Fri, 01 Apr 2016 15:26:06
Message-Id: 1459524351.e9c83fdc1a992d599593e963f44ef44dccfa4090.kensington@gentoo
1 commit: e9c83fdc1a992d599593e963f44ef44dccfa4090
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 15:25:23 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 15:25:51 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e9c83fdc
7
8 dev-qt/qtwebkit: manually run syncqt.pl to solve build failure
9
10 This is normally done by upstream before creating the release tarball, but they
11 forgot.
12
13 Gentoo-bug: 577574
14
15 Package-Manager: portage-2.2.28
16
17 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild | 5 ++++-
18 dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild | 5 ++++-
19 2 files changed, 8 insertions(+), 2 deletions(-)
20
21 diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
22 index 58876f1..a3a0f0f 100644
23 --- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
24 +++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
25 @@ -4,7 +4,7 @@
26
27 EAPI=6
28 PYTHON_COMPAT=( python2_7 )
29 -inherit python-any-r1 qt5-build
30 +inherit python-any-r1 qmake-utils qt5-build
31
32 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
33 SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
34 @@ -105,5 +105,8 @@ src_prepare() {
35 # bug 458222
36 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
37
38 + # bug 577574
39 + "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
40 +
41 qt5-build_src_prepare
42 }
43
44 diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
45 index 6f84eba..8a1ac2e 100644
46 --- a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
47 +++ b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
48 @@ -4,7 +4,7 @@
49
50 EAPI=6
51 PYTHON_COMPAT=( python2_7 )
52 -inherit python-any-r1 qt5-build
53 +inherit python-any-r1 qmake-utils qt5-build
54
55 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
56
57 @@ -104,5 +104,8 @@ src_prepare() {
58 # bug 458222
59 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
60
61 + # bug 577574
62 + "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
63 +
64 qt5-build_src_prepare
65 }