commit: 130397a485c632e705b789bbc72f1c31e9ffcf17
Author: Zamarin Arthur <arthurzam <AT> gmail <DOT> com>
AuthorDate: Sat Jan 28 12:25:32 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 14:15:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=130397a4
dev-qt/qtwebkit: fix 5.8 gstreamer patches
.../files/qtwebkit-5.8.0-disable-gstreamer.patch | 15 +++++++++++++++
.../files/qtwebkit-5.8.0-use-gstreamer010.patch | 18 ++++++++++++++++++
dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild | 4 ++--
dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild | 4 ++--
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 4 ++--
5 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
new file mode 100644
index 0000000..867e8dc
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- a/Tools/qmake/mkspecs/features/features.prf
++++ b/Tools/qmake/mkspecs/features/features.prf
+@@ -101,12 +101,6 @@ defineTest(detectFeatures) {
+
+ # HTML5 Media Support for builds with GStreamer
+ unix:!mac:qtConfig(pkg-config) {
+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0
gstreamer-plugins-base-1.0") {
+- WEBKIT_CONFIG += video use_gstreamer
+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\'
\'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+- }
+- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+ }
+
+ !enable?(video):qtHaveModule(multimediawidgets) {
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
new file mode 100644
index 0000000..b286059
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
@@ -0,0 +1,18 @@
+--- a/Tools/qmake/mkspecs/features/features.prf
++++ b/Tools/qmake/mkspecs/features/features.prf
+@@ -99,14 +99,8 @@ defineTest(detectFeatures) {
+ qtConfig(dynamicgl): WEBKIT_CONFIG += have_dynamicgl
+
+ # HTML5 Media Support for builds with GStreamer
+- unix:!mac:qtConfig(pkg-config) {
+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0
gstreamer-plugins-base-1.0") {
+- WEBKIT_CONFIG += video use_gstreamer
+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\'
\'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+- }
++ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+ use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+- }
+
+ !enable?(video):false {
+ WEBKIT_CONFIG += video use_qt_multimedia
diff --git a/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild
index f3b7436..21f6368 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild
@@ -89,9 +89,9 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
if use gstreamer010; then
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
elif ! use gstreamer; then
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi
# bug 562396
diff --git a/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild
index 6f84eba..b110c3f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild
@@ -88,9 +88,9 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
if use gstreamer010; then
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
elif ! use gstreamer; then
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi
# bug 562396
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 6f84eba..b110c3f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -88,9 +88,9 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
if use gstreamer010; then
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
elif ! use gstreamer; then
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi
# bug 562396
