* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2015-05-31 16:29 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-05-31 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 4b376d4e6d5163cc9d0c9f8f4fd9c3490a210d8f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 16:28:54 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May 31 16:28:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b376d4e
[dev-qt/qtwebkit] Remove insecure RPATH wrt bug #466216.
Package-Manager: portage-2.2.20
dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch | 13 +++++++++++++
dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 5 ++++-
dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 5 ++++-
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 5 ++++-
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
new file mode 100644
index 0000000..ffe44d2
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
@@ -0,0 +1,13 @@
+Avoid insecure RPATH wrt bug #466216.
+
+--- Tools/qmake/mkspecs/features/unix/default_post.prf
++++ Tools/qmake/mkspecs/features/unix/default_post.prf
+@@ -60,8 +60,6 @@
+ }
+ }
+
+-contains(TEMPLATE, app): CONFIG += rpath
+-
+ CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
+ # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
+ !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
index 08750fb..7812f80 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
@@ -62,7 +62,10 @@ DEPEND="${RDEPEND}
virtual/rubygems
"
-PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.1-leveldb.patch"
+ "${FILESDIR}/${PN}-5.4.1-rpath.patch"
+)
src_prepare() {
# ensure bundled library cannot be used
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
index 88a5767..c9a2b5d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
@@ -62,7 +62,10 @@ DEPEND="${RDEPEND}
virtual/rubygems
"
-PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.1-leveldb.patch"
+ "${FILESDIR}/${PN}-5.4.1-rpath.patch"
+)
src_prepare() {
# ensure bundled library cannot be used
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 88a5767..c9a2b5d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -62,7 +62,10 @@ DEPEND="${RDEPEND}
virtual/rubygems
"
-PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.1-leveldb.patch"
+ "${FILESDIR}/${PN}-5.4.1-rpath.patch"
+)
src_prepare() {
# ensure bundled library cannot be used
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2015-07-10 14:48 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2015-07-10 14:48 UTC (permalink / raw
To: gentoo-commits
commit: e0a0c3db69c8072b7d1c8fc43f763748f1ebe7b7
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 14:48:39 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 14:48:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e0a0c3db
[dev-qt/qtwebkit:5] Apply the 5.5.0 rpath patch to 5.9999 as well.
Package-Manager: portage-2.2.20
dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch | 13 -------------
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
deleted file mode 100644
index ffe44d2..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Avoid insecure RPATH wrt bug #466216.
-
---- Tools/qmake/mkspecs/features/unix/default_post.prf
-+++ Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -60,8 +60,6 @@
- }
- }
-
--contains(TEMPLATE, app): CONFIG += rpath
--
- CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
- # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
- !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 8f55550..8f4987c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4.1-leveldb.patch"
- "${FILESDIR}/${PN}-5.4.1-rpath.patch"
+ "${FILESDIR}/${PN}-5.5.0-rpath.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2015-07-15 1:30 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2015-07-15 1:30 UTC (permalink / raw
To: gentoo-commits
commit: 03e38390e94742acee1543f33763add65d8abb49
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 01:30:45 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 01:30:45 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=03e38390
[dev-qt/qtwebkit] Sync patch name.
Package-Manager: portage-2.2.20
...qtwebkit-5.4.1-leveldb.patch => qtwebkit-5.4.2-system-leveldb.patch} | 0
dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild | 2 +-
dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 2 +-
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
similarity index 100%
rename from dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch
rename to dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index 954a3aa..c16616b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.4.1-leveldb.patch"
+ "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
)
src_prepare() {
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
index 954a3aa..c16616b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.4.1-leveldb.patch"
+ "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
)
src_prepare() {
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 954a3aa..c16616b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.4.1-leveldb.patch"
+ "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2016-01-20 15:40 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2016-01-20 15:40 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2017-01-28 14:15 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-01-28 14:15 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-28 14:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-15 1:30 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2017-01-28 14:15 Michael Palimaka
2016-01-20 15:40 Davide Pesavento
2015-07-10 14:48 Davide Pesavento
2015-05-31 16:29 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox