| 1 |
commit: 6010c5413c9eae99ff103d47699b90c782032915 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 17 16:18:13 2018 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 17 16:18:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6010c541 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: remove USE="system-libvpx" |
| 9 |
|
| 10 |
The patch does not apply at this time, without some changes, and |
| 11 |
upstream has worked around the build issues that occur due to the |
| 12 |
still unreleased version of 'libvpx' that is required. As such, to |
| 13 |
build using the bundled version, the flag is no longer needed, but |
| 14 |
can be added back in the future if need be. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 17 |
|
| 18 |
.../qtwebengine-5.12.0-add-libvpx-options.patch | 20 -------------------- |
| 19 |
dev-qt/qtwebengine/metadata.xml | 2 -- |
| 20 |
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 6 ++---- |
| 21 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 ++---- |
| 22 |
4 files changed, 4 insertions(+), 30 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch |
| 25 |
deleted file mode 100644 |
| 26 |
index fd278fe7..00000000 |
| 27 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch |
| 28 |
+++ /dev/null |
| 29 |
@@ -1,20 +0,0 @@ |
| 30 |
---- a/src/core/configure.json 2018-08-17 19:00:05.269528234 +0300 |
| 31 |
-+++ b/src/core/configure.json 2018-08-17 19:01:31.444789488 +0300 |
| 32 |
-@@ -24,6 +24,7 @@ |
| 33 |
- "webengine-geolocation": "boolean", |
| 34 |
- "webengine-v8-snapshot": "boolean", |
| 35 |
- "webengine-webchannel": "boolean", |
| 36 |
-+ "webengine-libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } }, |
| 37 |
- "alsa": { "type": "boolean", "name": "webengine-alsa" }, |
| 38 |
- "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" }, |
| 39 |
- "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, |
| 40 |
-@@ -33,7 +34,8 @@ |
| 41 |
- "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" }, |
| 42 |
- "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" }, |
| 43 |
- "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" }, |
| 44 |
-- "webrtc": { "type": "boolean", "name": "webengine-webrtc" } |
| 45 |
-+ "webrtc": { "type": "boolean", "name": "webengine-webrtc" }, |
| 46 |
-+ "libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } } |
| 47 |
- } |
| 48 |
- }, |
| 49 |
- |
| 50 |
|
| 51 |
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml |
| 52 |
index 429513db..acca7340 100644 |
| 53 |
--- a/dev-qt/qtwebengine/metadata.xml |
| 54 |
+++ b/dev-qt/qtwebengine/metadata.xml |
| 55 |
@@ -16,8 +16,6 @@ |
| 56 |
instead of bundled.</flag> |
| 57 |
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> |
| 58 |
instead of bundled.</flag> |
| 59 |
- <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> |
| 60 |
- instead of bundled.</flag> |
| 61 |
<flag name="widgets">Enable QtWidgets support</flag> |
| 62 |
</use> |
| 63 |
<upstream> |
| 64 |
|
| 65 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
| 66 |
index 4fab7ab9..90b09f43 100644 |
| 67 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
| 68 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
| 69 |
@@ -1,4 +1,4 @@ |
| 70 |
-# Copyright 1999-2018 Gentoo Foundation |
| 71 |
+# Copyright 1999-2018 Gentoo Authors |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
|
| 74 |
EAPI=6 |
| 75 |
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 76 |
fi |
| 77 |
|
| 78 |
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio |
| 79 |
- +system-ffmpeg +system-icu +system-libvpx widgets" |
| 80 |
+ +system-ffmpeg +system-icu widgets" |
| 81 |
REQUIRED_USE="designer? ( widgets )" |
| 82 |
|
| 83 |
RDEPEND=" |
| 84 |
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND} |
| 85 |
pax_kernel? ( sys-apps/elfix ) |
| 86 |
" |
| 87 |
|
| 88 |
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" ) |
| 89 |
- |
| 90 |
src_prepare() { |
| 91 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 92 |
|
| 93 |
|
| 94 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 95 |
index 4fab7ab9..90b09f43 100644 |
| 96 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 97 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 98 |
@@ -1,4 +1,4 @@ |
| 99 |
-# Copyright 1999-2018 Gentoo Foundation |
| 100 |
+# Copyright 1999-2018 Gentoo Authors |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
|
| 103 |
EAPI=6 |
| 104 |
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 105 |
fi |
| 106 |
|
| 107 |
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio |
| 108 |
- +system-ffmpeg +system-icu +system-libvpx widgets" |
| 109 |
+ +system-ffmpeg +system-icu widgets" |
| 110 |
REQUIRED_USE="designer? ( widgets )" |
| 111 |
|
| 112 |
RDEPEND=" |
| 113 |
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND} |
| 114 |
pax_kernel? ( sys-apps/elfix ) |
| 115 |
" |
| 116 |
|
| 117 |
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" ) |
| 118 |
- |
| 119 |
src_prepare() { |
| 120 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
Archives