commit: 153748846f61f80a790c18505fed49a17c26ff30
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 10:29:48 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 10:29:55 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=15374884
dev-qt/qtwebkit: fix opengl USE flag for 5.9
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 4 ++--
dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 4 ++--
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 7e11e4b2..6fb0b38b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -72,6 +72,8 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_config opengl opengl
Tools/qmake/mkspecs/features/features.prf
+
qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
@@ -88,8 +90,6 @@ src_prepare() {
# bug 562396
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG +=
use_3d_graphics/d' \
- Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
index 7e11e4b2..6fb0b38b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
@@ -72,6 +72,8 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_config opengl opengl
Tools/qmake/mkspecs/features/features.prf
+
qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
@@ -88,8 +90,6 @@ src_prepare() {
# bug 562396
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG +=
use_3d_graphics/d' \
- Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 7e11e4b2..6fb0b38b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -72,6 +72,8 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_config opengl opengl
Tools/qmake/mkspecs/features/features.prf
+
qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
@@ -88,8 +90,6 @@ src_prepare() {
# bug 562396
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG +=
use_3d_graphics/d' \
- Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
