* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2016-11-09 19:49 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2016-11-09 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 4124357ed1166097c39acf2fb596cac48deeafbe
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 9 19:42:16 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 9 19:42:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4124357e
dev-qt/qtwebkit: Add the rest of 5.x, fix
Previously, we were missing a patch that prevents segmentation faults in
JavaScriptCore
dev-qt/qtwebkit/Manifest | 13 +++++++++----
dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch | 8 ++++----
.../files/qtwebkit-5.5.1-fix-stack-size-musl.patch | 14 ++++++++++++++
dev-qt/qtwebkit/metadata.xml | 11 +++++++++--
.../{qtwebkit-5.5.1-r99.ebuild => qtwebkit-5.6.1.ebuild} | 12 +++++++-----
.../{qtwebkit-5.5.1-r99.ebuild => qtwebkit-5.6.2.ebuild} | 12 +++++++-----
.../{qtwebkit-5.5.1-r99.ebuild => qtwebkit-5.7.0.ebuild} | 12 +++++++-----
7 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 44374e4..29a92a7 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,8 +1,13 @@
AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71
AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274
-AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7
+AUX qtwebkit-5.4.2-system-leveldb.patch 711 SHA256 791a952174e5b50b0fc2a0e7b12fd6829e88b3fb59b6d8ccefe469df272957e7 SHA512 d95d6e697d5e0b951465180d3f6bfa0ac16fc0f7a29504f773cf3bb28b1a7472f7bab83f379ea980851b6ed64a7d49cefcb27a503d37e5ce90110318628febcb WHIRLPOOL e979a7691faeeda737c916c183365619b875dd5fd872f1fcba16ff19549d0d6238c813cf01b0fa9cd649100422ed2de8987191d2343c062d46ee2276d7cd2407
AUX qtwebkit-5.5.0-fix-backtrace-detection-musl.patch 963 SHA256 191811606733d24b368bb25a4b0b737a504b1b78b5bb6ef88bb0450be1b6ff16 SHA512 5cfe5f73e9f9017a73034e45355a4e8772c43b6beface7e7964df54e396eb04e5ca2e39dd3e8e1e7ea2cc0893dc620d8cf65d72703e5fa94786957dbe2af3bd7 WHIRLPOOL 005fc53e8ed1e02bdd88ffa3189b28db063dc4695c3277f65f0a459b343a85a378b517e8328f6e9762e9c5b4868fb768531fe24943bed1d25949d6a0e8b01fb3
AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec
-DIST qtwebkit-opensource-src-5.5.1.tar.xz 33489924 SHA256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 SHA512 a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a WHIRLPOOL a54eabaf72fdd4ffba4317b0c64b57da239605f0d1c8020be4282c0ce802727fd9321c4da14f9cb977419bedc97a4ac44cbc34e7003ff80ae31cfd983a577dc9
-EBUILD qtwebkit-5.5.1-r99.ebuild 3162 SHA256 7c0fbe90445d289249fede7c15fc710359b58cfa1edbb363a56f515a7c481a9d SHA512 113739843636170ee4f1f3c23ce92f91e39eedd95b29becef2a5df842478a65a47e847671a171853d8b7bf421ccbf16cc8cb2251f0e319035a667bd01a4a3787 WHIRLPOOL 717d283181a8c733abc34183bb6d89933e62231712c29b5fc9fda01cf3cf599432678ecaf653a711ffd7293ee1c3578159ace020067b73ae22ccd8303eea7ffa
-MISC metadata.xml 1181 SHA256 608b284f3fcb85c515124201ada0dca07e027de204c44cbb2c75e4f328c62f32 SHA512 f7672e630141d94127642827ab6ee7fad430ed457acee5fe7dbf8188870484f0679e3004e6674f4ec723315b72743eb8057776e6ea6f28947aa5cbf9a210409a WHIRLPOOL 70a40d4cfdb624a93cbd4e39855211d40ec8218f9b62ea18f2fc93e7b45678fe6f97da5ac23d3d3aea5dec0c41a7c5c2fdc2924097f805b55d93948988c5c3cf
+AUX qtwebkit-5.5.1-fix-stack-size-musl.patch 979 SHA256 bc19a89dc3fe8867b129f18f4ded4d582571989a9ea68ecee495e48468afdfe5 SHA512 f41eadec259da6bf14e709fa7e1f3ecef988a382a4952f641a7319253805a89dcabd273a23aa4523f2aa54e425ca84b76352ebd4d51b15a132ce74eef30e76ec WHIRLPOOL ae6fdda41dd661ceecf00bc7dd6c93c11115de5e3b91cb2167e4ac808a13db4056b2a4175e2fe1b36e07a5363f59a4cd917de4ce9c024f4e36bff125b944e038
+DIST qtwebkit-opensource-src-5.6.1.tar.xz 35306084 SHA256 f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa SHA512 fb244d1913fb4387757580758a43594becbfd3b9fedf53ce3026290ba66a7044f78e242e04269030e200648931bbd625a6192c3455374eafa6021bb7b35c682f WHIRLPOOL c3b00ad976c20f00b6984ba099fe0e03381629c78dde292ec524f2ef8b530c9875a1c57940a0a3652c9bd13afbab83414b66ce0c2e7c4752a9f729767921f70f
+DIST qtwebkit-opensource-src-5.6.2.tar.xz 35306252 SHA256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 SHA512 d3f795463c957b4927d61280df831d08282bf6c9e624cf1db2709ab56ab218eb028192a4efaef21e0bdb28edd42de8ec08995f37fc828bde99000cf6919c33c3 WHIRLPOOL 9667f2f68bb832fdf3f5de14da641afd3b71a0c270e436257bc37ae86ed7d8d3434cdcada3b8818ab73ac6866bd4a69892ae682618d6d6a00cccccd287bda4bf
+DIST qtwebkit-opensource-src-5.7.0.tar.xz 35304268 SHA256 c7a3253cbf8e6035c54c3b08d8a9457bd82efbce71d4b363c8f753fd07bd34df SHA512 63c36f35132535c4391f8d0925cc2dfd88d7ec69cc9adefe383fefaec24f6f25280dd57bfb07eadf993506c310712078c315a90965eab09784eb3af9b6096436 WHIRLPOOL b65217bd11798833fa47c82b7cfc88fda4789afe3eaf9af6ed7045bf16b260b9ac466377104b05e57095e3c02234ca8b928c607e8adf45b509ef0bd789e52108
+EBUILD qtwebkit-5.6.1.ebuild 3338 SHA256 3989d24ce317c001da86d58081a07c991afcd92eea83ded07ca5658a441dffde SHA512 eecf6ffd10db1312b6c07c01015046323479c292acd691d0e599af2c5bc7b1bd94cf4616063b55dc457ee4dc3e5a7cf4437b673367f4b8410cb8869a8c0cae8f WHIRLPOOL 8aaf222b6bd7efdeea015e541685b11ac9a72d6b850452090f8273f47233397c42e6dcf49351da9554b6bce62afd6b858eb4da22da2b497d3735316ffe080416
+EBUILD qtwebkit-5.6.2.ebuild 3342 SHA256 8d7fd93e1e4b535fe275768e825251072bda71c61d5f2e1b5c2e36099933889c SHA512 682715349951df7ce6c7fe617c916435e8dd421a1cc445b4324cb0a15ef7e0820eaf25e0a37cf3eb6de558dd26108488afb9abacd3c8852e33e1eda5340568cb WHIRLPOOL 72f26195f2ac2d143d07aa9fad336315dd71c60ef1a378a5290d46f090a4528f5f61b38f0706d71f9415cd4ca903f49330aa4d5a23da160d033be15a63e97247
+EBUILD qtwebkit-5.7.0.ebuild 3342 SHA256 8d7fd93e1e4b535fe275768e825251072bda71c61d5f2e1b5c2e36099933889c SHA512 682715349951df7ce6c7fe617c916435e8dd421a1cc445b4324cb0a15ef7e0820eaf25e0a37cf3eb6de558dd26108488afb9abacd3c8852e33e1eda5340568cb WHIRLPOOL 72f26195f2ac2d143d07aa9fad336315dd71c60ef1a378a5290d46f090a4528f5f61b38f0706d71f9415cd4ca903f49330aa4d5a23da160d033be15a63e97247
+MISC metadata.xml 1465 SHA256 1a24b485de2335a882be912170519943a682a868c5d470b83955251582720a66 SHA512 2b19452f6bee9287d6430ec7eb5ab07c74288f68dbe2bba90be7249225906453ac5c745d921d2ee777da8226b031326cd94dcdedbd11a743f21f7e2718cca927 WHIRLPOOL 696ce8d280d6e69790a3f1ff8f3cbcbb9eb28374c37387c4c8876050d3688e9f2ffd07a2ecf24f21fc983d97f12b198d19964080d4987a929778ab639b702084
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
index 0a476c6..265d507 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -1,7 +1,7 @@
Correct header location so system dev-libs/leveldb can be detected.
---- Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+--- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
@@ -19,7 +19,7 @@
#include <leveldb/db.h>
@@ -12,8 +12,8 @@ Correct header location so system dev-libs/leveldb can be detected.
int main(int, char**)
{
---- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+--- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
@@ -38,7 +38,7 @@
#include <leveldb/comparator.h>
#include <leveldb/db.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch
new file mode 100644
index 0000000..68f8f6b
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch
@@ -0,0 +1,14 @@
+diff -Naur qtwebkit-opensource-src-5.5.1.orig/Source/JavaScriptCore/runtime/VMStackBounds.h qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/runtime/VMStackBounds.h
+--- qtwebkit-opensource-src-5.5.1.orig/Source/JavaScriptCore/runtime/VMStackBounds.h 2016-02-27 04:22:08.000000000 -0800
++++ qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/runtime/VMStackBounds.h 2016-04-10 19:30:47.907626687 -0700
+@@ -53,8 +53,8 @@
+ //
+ // These sizes were derived from the stack usage of a number of sites when
+ // layout occurs when we've already consumed most of the C stack.
+- const size_t requiredStack = 128 * KB;
+- const size_t errorModeRequiredStack = 64 * KB;
++ const size_t requiredStack = 32 * KB;
++ const size_t errorModeRequiredStack = 16 * KB;
+
+ size_t requiredCapacity = interpreter->isInErrorHandlingMode() ? errorModeRequiredStack : requiredStack;
+ RELEASE_ASSERT(m_bounds.size() >= requiredCapacity);
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 2bbeeab..2762147 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -6,9 +6,11 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="exceptions">Add support for exceptions - like catching them
+ inside the event loop (recommended by upstream)</flag>
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
- <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
- <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
+ <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
+ <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
@@ -20,4 +22,9 @@
<bugs-to>https://bugreports.qt.io/</bugs-to>
<doc>http://doc.qt.io/</doc>
</upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Qt API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild
similarity index 88%
copy from dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
copy to dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild
index b805d72..9d75464 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild
@@ -2,14 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 arm ~arm64 ppc64 x86"
fi
# TODO: qttestlib
@@ -67,6 +68,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
"${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
+ "${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
)
src_prepare() {
@@ -89,13 +91,13 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
if use gstreamer010; then
- epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+ PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
elif ! use gstreamer; then
- epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+ PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
fi
# bug 562396
- use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+ 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
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
similarity index 88%
copy from dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
copy to dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
index b805d72..6a032b8 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
@@ -2,14 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
# TODO: qttestlib
@@ -67,6 +68,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
"${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
+ "${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
)
src_prepare() {
@@ -89,13 +91,13 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
if use gstreamer010; then
- epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+ PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
elif ! use gstreamer; then
- epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+ PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
fi
# bug 562396
- use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+ 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
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.0.ebuild
similarity index 88%
rename from dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
rename to dev-qt/qtwebkit/qtwebkit-5.7.0.ebuild
index b805d72..6a032b8 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.0.ebuild
@@ -2,14 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
# TODO: qttestlib
@@ -67,6 +68,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
"${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
+ "${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
)
src_prepare() {
@@ -89,13 +91,13 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
if use gstreamer010; then
- epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+ PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
elif ! use gstreamer; then
- epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+ PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
fi
# bug 562396
- use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+ 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2017-11-29 6:39 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2017-11-29 6:39 UTC (permalink / raw
To: gentoo-commits
commit: 12d4d34c5cc9de063ddedcb1dbdd09b5d0a22fba
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 29 06:38:41 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 29 06:38:41 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=12d4d34c
dev-qt/qtwebkit: version bump to 5.9.1
dev-qt/qtwebkit/Manifest | 3 +-
.../files/qtwebkit-5.8.0-disable-gstreamer.patch | 15 +++
dev-qt/qtwebkit/metadata.xml | 1 +
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 122 +++++++++++++++++++++
4 files changed, 140 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 5e1202f..373025e 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1 +1,2 @@
-DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 SHA256 a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a WHIRLPOOL d2dce72777a6babb1c35025ff6d882b7f48895dca4425b9e29b099e45282e8538548a653f0757998d6a619d706544fad0363199d8979ccca94762ba39b6516bd
+DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
+DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
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/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 021a917..87f1ed3 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
new file mode 100644
index 0000000..4c30fd0
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+QT_MIN_VER="5.9.1:5"
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+# TODO: qttestlib
+
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/icu:=
+ >=dev-libs/leveldb-1.18-r1
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-qt/qtcore-${QT_MIN_VER}[icu]
+ >=dev-qt/qtgui-${QT_MIN_VER}
+ >=dev-qt/qtnetwork-${QT_MIN_VER}
+ >=dev-qt/qtsql-${QT_MIN_VER}
+ >=dev-qt/qtwidgets-${QT_MIN_VER}
+ media-libs/fontconfig:1.0
+ media-libs/libpng:0=
+ >=sys-libs/zlib-1.2.5
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXrender
+ geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
+ gstreamer? (
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
+ opengl? (
+ >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+ >=dev-qt/qtopengl-${QT_MIN_VER}
+ )
+ orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+ printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+ qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
+ webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
+ webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/ruby
+ dev-util/gperf
+ sys-devel/bison
+ sys-devel/flex
+ virtual/rubygems
+ test? ( >=dev-qt/qttest-${QT_MIN_VER} )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+ "${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
+ "${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
+)
+
+src_prepare() {
+ # ensure bundled library cannot be used
+ rm -r Source/ThirdParty/leveldb || die
+
+ # force using system library
+ sed -i -e 's/qtConfig(system-jpeg)/true/' \
+ -e 's/qtConfig(system-png)/true/' \
+ Tools/qmake/mkspecs/features/features.prf || die
+
+ # bug 466216
+ sed -i -e '/CONFIG +=/s/rpath//' \
+ Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+ 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
+ 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/Target.pri \
+ Source/WebKit2/WebKit2.pri
+
+ if ! use gstreamer; then
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
+ fi
+
+ # bug 562396
+ use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
+
+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+
+ # bug 458222
+ sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+
+ qt5-build_src_prepare
+}
+
+src_install() {
+ qt5-build_src_install
+
+ # bug 572056
+ if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
+ eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
+ die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
@ 2018-05-14 16:25 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2018-05-14 16:25 UTC (permalink / raw
To: gentoo-commits
commit: fec12cb88c3d9f7124b6698fc13a6bb54e046fc0
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon May 14 16:24:30 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon May 14 16:24:30 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fec12cb8
dev-qt/qtwebkit: remove 5.7.1
dev-qt/qtwebkit/Manifest | 1 -
.../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 ---
.../files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 ---
dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 ----------------
dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 121 ---------------------
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 4 +-
6 files changed, 2 insertions(+), 249 deletions(-)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 373025e..97b9f0e 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,2 +1 @@
-DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
deleted file mode 100644
index 69550f2..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000
-+++ b/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000
-@@ -99,12 +99,6 @@
-
- # HTML5 Media Support for builds with GStreamer
- unix:!mac:!contains(QT_CONFIG, no-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.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
deleted file mode 100644
index 1c02e45..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100
-+++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100
-@@ -96,14 +96,8 @@
- use?(3d_graphics): WEBKIT_CONFIG += webgl
-
- # HTML5 Media Support for builds with GStreamer
-- unix:!mac:!contains(QT_CONFIG, no-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):qtHaveModule(multimediawidgets) {
- WEBKIT_CONFIG += video use_qt_multimedia
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
deleted file mode 100644
index 2a2709b..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Thu, 4 May 2017 15:12:37 +0300
-Subject: [PATCH] Fix compilation with ICU 59
-
-Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
-
-Task-number: QTBUG-60532
-Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++---
- Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
- Source/WTF/wtf/TypeTraits.h | 3 +++
- Source/WebKit2/Shared/API/c/WKString.cpp | 2 +-
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
-index 812f3d413..77a3fd0f4 100644
---- a/Source/JavaScriptCore/API/JSStringRef.cpp
-+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
-@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
- JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
- {
- initializeThreading();
-- return OpaqueJSString::create(chars, numChars).leakRef();
-+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
- }
-
- JSStringRef JSStringCreateWithUTF8CString(const char* string)
-@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
- JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
- {
- initializeThreading();
-- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
-+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
- }
-
- JSStringRef JSStringRetain(JSStringRef string)
-@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
-
- const JSChar* JSStringGetCharactersPtr(JSStringRef string)
- {
-- return string->characters();
-+ return reinterpret_cast<const JSChar*>(string->characters());
- }
-
- size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
-diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
-index 0b57f012d..05e27338b 100644
---- a/Source/JavaScriptCore/runtime/DateConversion.cpp
-+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
-@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
- #if OS(WINDOWS)
- TIME_ZONE_INFORMATION timeZoneInformation;
- GetTimeZoneInformation(&timeZoneInformation);
-- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
- #else
- struct tm gtm = t;
- char timeZoneName[70];
-diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
-index 9df2c95cf..f5d6121fd 100644
---- a/Source/WTF/wtf/TypeTraits.h
-+++ b/Source/WTF/wtf/TypeTraits.h
-@@ -72,6 +72,9 @@ namespace WTF {
- template<> struct IsInteger<unsigned long> { static const bool value = true; };
- template<> struct IsInteger<long long> { static const bool value = true; };
- template<> struct IsInteger<unsigned long long> { static const bool value = true; };
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
-+ template<> struct IsInteger<char16_t> { static const bool value = true; };
-+#endif
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- template<> struct IsInteger<wchar_t> { static const bool value = true; };
- #endif
-diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
-index cbac67dd8..23400a64e 100644
---- a/Source/WebKit2/Shared/API/c/WKString.cpp
-+++ b/Source/WebKit2/Shared/API/c/WKString.cpp
-@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
- size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
- {
- COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
-- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
-+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
- }
-
- size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
---
-2.13.1
-
diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
deleted file mode 100644
index 94d0aba..0000000
--- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/icu:=
- >=dev-libs/leveldb-1.18-r1
- dev-libs/libxml2:2
- dev-libs/libxslt
- ~dev-qt/qtcore-${PV}[icu]
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
- media-libs/fontconfig:1.0
- media-libs/libpng:0=
- >=sys-libs/zlib-1.2.5
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXrender
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gstreamer010? (
- dev-libs/glib:2
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- )
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
- opengl? ( ~dev-qt/qtopengl-${PV} )
- orientation? ( ~dev-qt/qtsensors-${PV} )
- printsupport? ( ~dev-qt/qtprintsupport-${PV} )
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- webchannel? ( ~dev-qt/qtwebchannel-${PV} )
- webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/ruby
- dev-util/gperf
- sys-devel/bison
- sys-devel/flex
- virtual/rubygems
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
- "${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
- "${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
- "${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
-)
-
-src_prepare() {
- # ensure bundled library cannot be used
- rm -r Source/ThirdParty/leveldb || die
-
- # bug 466216
- sed -i -e '/CONFIG +=/s/rpath//' \
- Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
- Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
- || die
-
- 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
- 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/Target.pri \
- Source/WebKit2/WebKit2.pri
-
- if use gstreamer010; then
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
- elif ! use gstreamer; then
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
- fi
-
- # 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
-
- # bug 458222
- sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
- qt5-build_src_prepare
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 572056
- if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
- eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
- die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
- fi
-}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index f9b7434..65ab114 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
# TODO: qttestlib
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-14 16:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-09 19:49 [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2017-11-29 6:39 Aric Belsito
2018-05-14 16:25 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox