Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/files/, dev-qt/qtwebkit23/
Date: Thu, 23 Jul 2015 17:23:39
Message-Id: 1437672190.b07560473a3d939efd7e2a4cb318b3b4c7e29eaf.pesa@gentoo
1 commit: b07560473a3d939efd7e2a4cb318b3b4c7e29eaf
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 23 17:23:10 2015 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 23 17:23:10 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b0756047
7
8 [dev-qt/qtwebkit23] Use standard PATCHES array.
9
10 Package-Manager: portage-2.2.20
11
12 ...3.4-use-correct-typedef.patch => use-correct-icu-typedef.patch} | 0
13 dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 7 ++++++-
14 2 files changed, 6 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-qt/qtwebkit23/files/qtwebkit23-2.3.4-use-correct-typedef.patch b/dev-qt/qtwebkit23/files/use-correct-icu-typedef.patch
17 similarity index 100%
18 rename from dev-qt/qtwebkit23/files/qtwebkit23-2.3.4-use-correct-typedef.patch
19 rename to dev-qt/qtwebkit23/files/use-correct-icu-typedef.patch
20
21 diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
22 index b338975..d2ada80 100644
23 --- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
24 +++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
25 @@ -51,6 +51,10 @@ DEPEND="${RDEPEND}
26 virtual/perl-Getopt-Long
27 "
28
29 +PATCHES=(
30 + "${FILESDIR}/use-correct-icu-typedef.patch"
31 +)
32 +
33 src_prepare() {
34 # examples cause a sandbox violation (bug 458222)
35 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
36 @@ -60,7 +64,8 @@ src_prepare() {
37 Source/WTF/WTF.pro \
38 Source/JavaScriptCore/Target.pri || die
39
40 - epatch "${FILESDIR}"/${PN}-2.3.4-use-correct-typedef.patch
41 + # apply patches
42 + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
43 epatch_user
44 }