From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
Date: Wed, 20 Jan 2016 15:40:52 +0000 (UTC) [thread overview]
Message-ID: <1453304443.8a562ff3ed3c110a2a2d2e3f0092bd3969a0856b.pesa@gentoo> (raw)
commit: 8a562ff3ed3c110a2a2d2e3f0092bd3969a0856b
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 15:40:43 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 15:40:43 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a562ff3
dev-qt/qtwebkit: sync
Package-Manager: portage-2.2.27
dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch | 15 +++++++++++++++
dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild | 15 ++++++++++-----
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 15 ++++++++++-----
3 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
new file mode 100644
index 0000000..40e58f0
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
@@ -0,0 +1,15 @@
+Allow disabling JIT for hardened.
+
+Author: Magnus Granberg <zorry@gentoo.org>
+Gentoo-bug: 562396
+
+--- a/Tools/qmake/mkspecs/features/features.pri
++++ b/Tools/qmake/mkspecs/features/features.pri
+@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
+ ENABLE_INPUT_TYPE_WEEK=0 \
+ ENABLE_INSPECTOR=1 \
+ ENABLE_INSPECTOR_SERVER=1 \
++ ENABLE_JIT=0 \
+ ENABLE_JAVASCRIPT_DEBUGGER=1 \
+ ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
+ ENABLE_LEGACY_NOTIFICATIONS=1 \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
index a52f272..593d86b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ fi
# TODO: qttestlib
-IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation printsupport qml webchannel webp"
+IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
RDEPEND="
@@ -83,7 +83,9 @@ src_prepare() {
qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+ qt_use_disable_mod webchannel webchannel \
+ Source/WebKit2/Target.pri \
+ Source/WebKit2/WebKit2.pri
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
@@ -91,9 +93,12 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+ # bug 562396
+ use jit || epatch "${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' \
+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
# bug 458222
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index a52f272..593d86b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ fi
# TODO: qttestlib
-IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation printsupport qml webchannel webp"
+IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
RDEPEND="
@@ -83,7 +83,9 @@ src_prepare() {
qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+ qt_use_disable_mod webchannel webchannel \
+ Source/WebKit2/Target.pri \
+ Source/WebKit2/WebKit2.pri
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
@@ -91,9 +93,12 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+ # bug 562396
+ use jit || epatch "${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' \
+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
# bug 458222
next reply other threads:[~2016-01-20 15:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 15:40 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-01-28 14:15 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/ Michael Palimaka
2015-07-15 1:30 Davide Pesavento
2015-07-10 14:48 Davide Pesavento
2015-05-31 16:29 Michael Palimaka
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=1453304443.8a562ff3ed3c110a2a2d2e3f0092bd3969a0856b.pesa@gentoo \
--to=pesa@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