1 |
commit: 7064af6a1dceefb550fcc9c43ba9ccfbff2c5187 |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 29 22:47:30 2020 +0000 |
4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 29 22:47:30 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7064af6a |
7 |
|
8 |
dev-qt/qtwebengine: [5.14] sync with 5.15 |
9 |
|
10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
11 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
12 |
|
13 |
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 23 ++++++++++++----------- |
14 |
1 file changed, 12 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild |
17 |
index 13940d0b..59cd6171 100644 |
18 |
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild |
19 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 1999-2019 Gentoo Authors |
22 |
+# Copyright 1999-2020 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
EAPI=7 |
26 |
@@ -11,8 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
27 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
28 |
fi |
29 |
|
30 |
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio |
31 |
- +system-ffmpeg +system-icu widgets" |
32 |
+IUSE="alsa bindist designer geolocation jumbo-build pax_kernel |
33 |
+ pulseaudio +system-ffmpeg +system-icu widgets" |
34 |
REQUIRED_USE="designer? ( widgets )" |
35 |
|
36 |
RDEPEND=" |
37 |
@@ -24,7 +24,6 @@ RDEPEND=" |
38 |
~dev-qt/qtdeclarative-${PV} |
39 |
~dev-qt/qtgui-${PV} |
40 |
~dev-qt/qtnetwork-${PV} |
41 |
- ~dev-qt/qtpositioning-${PV} |
42 |
~dev-qt/qtprintsupport-${PV} |
43 |
~dev-qt/qtwebchannel-${PV}[qml] |
44 |
dev-libs/expat |
45 |
@@ -60,6 +59,7 @@ RDEPEND=" |
46 |
x11-libs/libXtst |
47 |
alsa? ( media-libs/alsa-lib ) |
48 |
designer? ( ~dev-qt/designer-${PV} ) |
49 |
+ geolocation? ( ~dev-qt/qtpositioning-${PV} ) |
50 |
pulseaudio? ( media-sound/pulseaudio:= ) |
51 |
system-ffmpeg? ( media-video/ffmpeg:0= ) |
52 |
system-icu? ( >=dev-libs/icu-60.2:= ) |
53 |
@@ -105,14 +105,15 @@ src_configure() { |
54 |
|
55 |
local myqmakeargs=( |
56 |
-- |
57 |
- -opus |
58 |
-printing-and-pdf |
59 |
- -webp |
60 |
- $(usex alsa '-alsa' '') |
61 |
- $(usex bindist '' '-proprietary-codecs') |
62 |
- $(usex pulseaudio '-pulseaudio' '') |
63 |
- $(usex system-ffmpeg '-ffmpeg' '') |
64 |
- $(usex system-icu '-webengine-icu' '') |
65 |
+ -system-opus |
66 |
+ -system-webp |
67 |
+ $(usex alsa '-alsa' '-no-alsa') |
68 |
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') |
69 |
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') |
70 |
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') |
71 |
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') |
72 |
+ $(usex system-icu '-webengine-icu' '-no-webengine-icu') |
73 |
) |
74 |
qt5-build_src_configure |
75 |
} |