dev-qt/qtwebkit : version bump

4 files changed, 10 insertions, 69 deletions

diff --git a/dev-qt/qtwebkit/.qtwebkit-5.212.0_pre20190629-r10.ebuild.swp b/dev-qt/qtwebkit/.qtwebkit-5.212.0_pre20190629-r10.ebuild.swp
new file mode 100644
index 00000000..79ac2dfd
--- /dev/null
+++ b/dev-qt/qtwebkit/.qtwebkit-5.212.0_pre20190629-r10.ebuild.swp
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index eaf27bbb..7080d4f5 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1 +1 @@
-DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
+DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
deleted file mode 100644
index 1891f73d..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From dc02ec4080010e33b737db6491d71d6bb961a77d Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Fri, 4 Oct 2019 21:51:37 +0000
-Subject: [PATCH] Fix build with icu 65.1
- https://bugs.webkit.org/show_bug.cgi?id=202600
-
-Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
-Reviewed by Konstantin Tokarev.
-
-Source/WebCore:
-
-* dom/Document.cpp:
-(WebCore::isValidNameNonASCII):
-(WebCore::Document::parseQualifiedName):
-
-Source/WTF:
-
-* wtf/URLHelpers.cpp:
-(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
-
-Change-Id: I1b087322cbae43fbe155facdf933717ac8569b6c
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebCore/dom/Document.cpp |  6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 1bca2d0a66f8..19355f166019 100644
---- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
- 
-     for (unsigned i = 0; i < length;) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon) {
-                 ec = NAMESPACE_ERR;
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r10.ebuild
index f17fd778..174015d4 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r10.ebuild
@@ -3,18 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot
+MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot
+SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+S="${WORKDIR}/${MY_P}"
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 HOMEPAGE="https://www.qt.io/"
-SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
+IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
 	nsplugin? ( X )
@@ -23,10 +24,9 @@ REQUIRED_USE="
 "
 
 # Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
+QT_MIN_VER="5.12.3:5"
 BDEPEND="
 	${PYTHON_DEPS}
-	${RUBY_DEPS}
 	dev-lang/ruby:2.5
 	dev-lang/perl
 	dev-util/gperf
@@ -57,8 +57,8 @@ DEPEND="
 	hyphen? ( dev-libs/hyphen )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
 	opengl? (
-		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
+		>=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=]
+		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=]
 	)
 	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
 	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
@@ -75,12 +75,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
-PATCHES=( "${FILESDIR}/${P}-icu-65.patch" )
-
 _check_reqs() {
 	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
 		einfo "Checking for sufficient disk space to build ${PN} with debugging flags"