[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

["Jimi Huotari" <chiitoo@gentoo.org>]

commit:     6010c5413c9eae99ff103d47699b90c782032915
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 16:18:13 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 16:18:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6010c541

dev-qt/qtwebengine: remove USE="system-libvpx"

The patch does not apply at this time, without some changes, and
upstream has worked around the build issues that occur due to the
still unreleased version of 'libvpx' that is required.  As such, to
build using the bundled version, the flag is no longer needed, but
can be added back in the future if need be.

Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../qtwebengine-5.12.0-add-libvpx-options.patch      | 20 --------------------
 dev-qt/qtwebengine/metadata.xml                      |  2 --
 dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild      |  6 ++----
 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild         |  6 ++----
 4 files changed, 4 insertions(+), 30 deletions(-)

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
deleted file mode 100644
index fd278fe7..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/core/configure.json	2018-08-17 19:00:05.269528234 +0300
-+++ b/src/core/configure.json	2018-08-17 19:01:31.444789488 +0300
-@@ -24,6 +24,7 @@
-             "webengine-geolocation": "boolean",
-             "webengine-v8-snapshot": "boolean",
-             "webengine-webchannel": "boolean",
-+            "webengine-libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } },
-             "alsa": { "type": "boolean", "name": "webengine-alsa" },
-             "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
-             "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
-@@ -33,7 +34,8 @@
-             "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" },
-             "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" },
-             "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" },
--            "webrtc": { "type": "boolean", "name": "webengine-webrtc" }
-+            "webrtc": { "type": "boolean", "name": "webengine-webrtc" },
-+            "libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } }
-         }
-     },
- 

diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 429513db..acca7340 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -16,8 +16,6 @@
 			instead of bundled.</flag>
 		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
 			instead of bundled.</flag>
-		<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
-			instead of bundled.</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
 	</use>
 	<upstream>

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 4fab7ab9..90b09f43 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
-	+system-ffmpeg +system-icu +system-libvpx widgets"
+	+system-ffmpeg +system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" )
-
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
 

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 4fab7ab9..90b09f43 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
-	+system-ffmpeg +system-icu +system-libvpx widgets"
+	+system-ffmpeg +system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" )
-
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )