| 1 |
commit: 153748846f61f80a790c18505fed49a17c26ff30 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 23 10:29:48 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 23 10:29:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=15374884 |
| 7 |
|
| 8 |
dev-qt/qtwebkit: fix opengl USE flag for 5.9 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 4 ++-- |
| 13 |
dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 4 ++-- |
| 14 |
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 4 ++-- |
| 15 |
3 files changed, 6 insertions(+), 6 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 7e11e4b2..6fb0b38b 100644 |
| 19 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild |
| 20 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild |
| 21 |
@@ -72,6 +72,8 @@ src_prepare() { |
| 22 |
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ |
| 23 |
|| die |
| 24 |
|
| 25 |
+ qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf |
| 26 |
+ |
| 27 |
qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf |
| 28 |
qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf |
| 29 |
qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf |
| 30 |
@@ -88,8 +90,6 @@ src_prepare() { |
| 31 |
# bug 562396 |
| 32 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") |
| 33 |
|
| 34 |
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ |
| 35 |
- Tools/qmake/mkspecs/features/features.prf || die |
| 36 |
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 37 |
Tools/qmake/mkspecs/features/features.prf || die |
| 38 |
|
| 39 |
|
| 40 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild |
| 41 |
index 7e11e4b2..6fb0b38b 100644 |
| 42 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild |
| 43 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild |
| 44 |
@@ -72,6 +72,8 @@ src_prepare() { |
| 45 |
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ |
| 46 |
|| die |
| 47 |
|
| 48 |
+ qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf |
| 49 |
+ |
| 50 |
qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf |
| 51 |
qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf |
| 52 |
qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf |
| 53 |
@@ -88,8 +90,6 @@ src_prepare() { |
| 54 |
# bug 562396 |
| 55 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") |
| 56 |
|
| 57 |
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ |
| 58 |
- Tools/qmake/mkspecs/features/features.prf || die |
| 59 |
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 60 |
Tools/qmake/mkspecs/features/features.prf || die |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 64 |
index 7e11e4b2..6fb0b38b 100644 |
| 65 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 66 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 67 |
@@ -72,6 +72,8 @@ src_prepare() { |
| 68 |
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ |
| 69 |
|| die |
| 70 |
|
| 71 |
+ qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf |
| 72 |
+ |
| 73 |
qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf |
| 74 |
qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf |
| 75 |
qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf |
| 76 |
@@ -88,8 +90,6 @@ src_prepare() { |
| 77 |
# bug 562396 |
| 78 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") |
| 79 |
|
| 80 |
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ |
| 81 |
- Tools/qmake/mkspecs/features/features.prf || die |
| 82 |
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 83 |
Tools/qmake/mkspecs/features/features.prf || die |
Archives