| 1 |
commit: b47b669dbbf90f33161cbfddceffd078beaf0635 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 23 08:35:56 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 23 08:36:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b47b669d |
| 7 |
|
| 8 |
dev-qt/qtwebkit: remove support for dead and vulnerable gstreamer:0.10 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 13 +++---------- |
| 13 |
dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 13 +++---------- |
| 14 |
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 13 +++---------- |
| 15 |
3 files changed, 9 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild |
| 18 |
index 7d26b519..7e11e4b2 100644 |
| 19 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild |
| 20 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild |
| 21 |
@@ -13,8 +13,8 @@ fi |
| 22 |
|
| 23 |
# TODO: qttestlib |
| 24 |
|
| 25 |
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp" |
| 26 |
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" |
| 27 |
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport qml webchannel webp" |
| 28 |
+REQUIRED_USE="?? ( gstreamer multimedia )" |
| 29 |
|
| 30 |
RDEPEND=" |
| 31 |
dev-db/sqlite:3 |
| 32 |
@@ -41,11 +41,6 @@ RDEPEND=" |
| 33 |
media-libs/gstreamer:1.0 |
| 34 |
media-libs/gst-plugins-base:1.0 |
| 35 |
) |
| 36 |
- gstreamer010? ( |
| 37 |
- dev-libs/glib:2 |
| 38 |
- media-libs/gstreamer:0.10 |
| 39 |
- media-libs/gst-plugins-base:0.10 |
| 40 |
- ) |
| 41 |
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] ) |
| 42 |
opengl? ( ~dev-qt/qtopengl-${PV} ) |
| 43 |
orientation? ( ~dev-qt/qtsensors-${PV} ) |
| 44 |
@@ -86,9 +81,7 @@ src_prepare() { |
| 45 |
Source/WebKit2/Target.pri \ |
| 46 |
Source/WebKit2/WebKit2.pri |
| 47 |
|
| 48 |
- if use gstreamer010; then |
| 49 |
- PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch") |
| 50 |
- elif ! use gstreamer; then |
| 51 |
+ if ! use gstreamer; then |
| 52 |
PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") |
| 53 |
fi |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild |
| 57 |
index 7d26b519..7e11e4b2 100644 |
| 58 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild |
| 59 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild |
| 60 |
@@ -13,8 +13,8 @@ fi |
| 61 |
|
| 62 |
# TODO: qttestlib |
| 63 |
|
| 64 |
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp" |
| 65 |
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" |
| 66 |
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport qml webchannel webp" |
| 67 |
+REQUIRED_USE="?? ( gstreamer multimedia )" |
| 68 |
|
| 69 |
RDEPEND=" |
| 70 |
dev-db/sqlite:3 |
| 71 |
@@ -41,11 +41,6 @@ RDEPEND=" |
| 72 |
media-libs/gstreamer:1.0 |
| 73 |
media-libs/gst-plugins-base:1.0 |
| 74 |
) |
| 75 |
- gstreamer010? ( |
| 76 |
- dev-libs/glib:2 |
| 77 |
- media-libs/gstreamer:0.10 |
| 78 |
- media-libs/gst-plugins-base:0.10 |
| 79 |
- ) |
| 80 |
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] ) |
| 81 |
opengl? ( ~dev-qt/qtopengl-${PV} ) |
| 82 |
orientation? ( ~dev-qt/qtsensors-${PV} ) |
| 83 |
@@ -86,9 +81,7 @@ src_prepare() { |
| 84 |
Source/WebKit2/Target.pri \ |
| 85 |
Source/WebKit2/WebKit2.pri |
| 86 |
|
| 87 |
- if use gstreamer010; then |
| 88 |
- PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch") |
| 89 |
- elif ! use gstreamer; then |
| 90 |
+ if ! use gstreamer; then |
| 91 |
PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") |
| 92 |
fi |
| 93 |
|
| 94 |
|
| 95 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 96 |
index 7d26b519..7e11e4b2 100644 |
| 97 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 98 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 99 |
@@ -13,8 +13,8 @@ fi |
| 100 |
|
| 101 |
# TODO: qttestlib |
| 102 |
|
| 103 |
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp" |
| 104 |
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" |
| 105 |
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport qml webchannel webp" |
| 106 |
+REQUIRED_USE="?? ( gstreamer multimedia )" |
| 107 |
|
| 108 |
RDEPEND=" |
| 109 |
dev-db/sqlite:3 |
| 110 |
@@ -41,11 +41,6 @@ RDEPEND=" |
| 111 |
media-libs/gstreamer:1.0 |
| 112 |
media-libs/gst-plugins-base:1.0 |
| 113 |
) |
| 114 |
- gstreamer010? ( |
| 115 |
- dev-libs/glib:2 |
| 116 |
- media-libs/gstreamer:0.10 |
| 117 |
- media-libs/gst-plugins-base:0.10 |
| 118 |
- ) |
| 119 |
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] ) |
| 120 |
opengl? ( ~dev-qt/qtopengl-${PV} ) |
| 121 |
orientation? ( ~dev-qt/qtsensors-${PV} ) |
| 122 |
@@ -86,9 +81,7 @@ src_prepare() { |
| 123 |
Source/WebKit2/Target.pri \ |
| 124 |
Source/WebKit2/WebKit2.pri |
| 125 |
|
| 126 |
- if use gstreamer010; then |
| 127 |
- PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch") |
| 128 |
- elif ! use gstreamer; then |
| 129 |
+ if ! use gstreamer; then |
| 130 |
PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") |
| 131 |
fi |
Archives