public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/
Date: Sun, 23 Jul 2017 08:36:14 +0000 (UTC)	[thread overview]
Message-ID: <1500798966.b47b669dbbf90f33161cbfddceffd078beaf0635.kensington@gentoo> (raw)

commit:     b47b669dbbf90f33161cbfddceffd078beaf0635
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 08:35:56 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 08:36:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b47b669d

dev-qt/qtwebkit: remove support for dead and vulnerable gstreamer:0.10

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild    | 13 +++----------
 dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 13 +++----------
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild   | 13 +++----------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
 	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
 	opengl? ( ~dev-qt/qtopengl-${PV} )
 	orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
 		Source/WebKit2/Target.pri \
 		Source/WebKit2/WebKit2.pri
 
-	if use gstreamer010; then
-		PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-	elif ! use gstreamer; then
+	if ! use gstreamer; then
 		PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
 	fi
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
 	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
 	opengl? ( ~dev-qt/qtopengl-${PV} )
 	orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
 		Source/WebKit2/Target.pri \
 		Source/WebKit2/WebKit2.pri
 
-	if use gstreamer010; then
-		PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-	elif ! use gstreamer; then
+	if ! use gstreamer; then
 		PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
 	fi
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
 	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
 	opengl? ( ~dev-qt/qtopengl-${PV} )
 	orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
 		Source/WebKit2/Target.pri \
 		Source/WebKit2/WebKit2.pri
 
-	if use gstreamer010; then
-		PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-	elif ! use gstreamer; then
+	if ! use gstreamer; then
 		PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
 	fi
 


             reply	other threads:[~2017-07-23  8:36 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-23  8:36 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-24  9:08 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ Andreas Sturmlechner
2020-04-03 20:03 Andreas Sturmlechner
2020-03-11 17:13 Andreas Sturmlechner
2020-01-14 22:55 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2019-10-23  6:35 Andreas Sturmlechner
2019-07-06 10:28 Andreas Sturmlechner
2018-06-18 13:34 Jimi Huotari
2017-10-07  6:09 Michael Palimaka
2017-10-07  3:38 Michael Palimaka
2017-10-07  3:38 Michael Palimaka
2017-07-23 11:57 Michael Palimaka
2017-07-23 11:35 Michael Palimaka
2017-07-23 10:30 Michael Palimaka
2017-06-18  7:54 Michael Palimaka
2017-06-11 13:09 Michael Palimaka
2016-04-23 17:20 Michael Palimaka
2016-04-09 15:48 Davide Pesavento
2016-04-06 15:00 Davide Pesavento
2016-04-06 15:00 Davide Pesavento
2016-04-02 13:54 Michael Palimaka
2016-04-01 15:26 Michael Palimaka
2016-03-17  9:43 Michael Palimaka
2016-01-20 17:35 Davide Pesavento
2016-01-19 19:19 Davide Pesavento
2015-10-17 17:02 Michael Palimaka
2015-10-17 17:02 Michael Palimaka
2015-10-17 17:02 Michael Palimaka
2015-07-10 14:43 Davide Pesavento
2015-06-23 12:49 Vladimir Smirnov
2015-04-26 23:12 Davide Pesavento
2015-03-26  1:49 Davide Pesavento
2015-03-15 14:44 Michael Palimaka
2015-03-05  9:49 Michael Palimaka
2015-01-11 18:17 Davide Pesavento
2014-10-22 17:27 Michael Palimaka
2014-09-28 17:40 Davide Pesavento
2014-09-02  0:08 Davide Pesavento
2014-06-10  7:58 Michael Palimaka
2014-05-26 13:35 Davide Pesavento
2014-05-18 20:05 Davide Pesavento
2014-02-26 11:39 Michael Palimaka
2013-10-20 23:03 Davide Pesavento
2013-08-08 10:53 Michael Palimaka
2013-08-06  8:04 Michael Palimaka
2013-04-07 23:11 Davide Pesavento

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1500798966.b47b669dbbf90f33161cbfddceffd078beaf0635.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox