From d7af13346946a4667686842e79e7a82736a3085b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 13 Aug 2018 15:41:31 +0100
Subject: dev-qt/qtwebkit : version bump

---
 dev-qt/qtwebkit/Manifest                           |   2 +-
 .../qtwebkit-5.212.0_pre20180120-functional.patch  |  22 +++
 dev-qt/qtwebkit/files/qtwebkit-fixes.patch         |  31 -----
 .../qtwebkit/qtwebkit-5.212.0_alpha2-r1000.ebuild  | 151 ---------------------
 .../qtwebkit-5.212.0_pre20180120-r1337.ebuild      | 140 +++++++++++++++++++
 5 files changed, 163 insertions(+), 183 deletions(-)
 create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
 delete mode 100644 dev-qt/qtwebkit/files/qtwebkit-fixes.patch
 delete mode 100644 dev-qt/qtwebkit/qtwebkit-5.212.0_alpha2-r1000.ebuild
 create mode 100644 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild

(limited to 'dev-qt')

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index d39f0ff9..2edec829 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1 +1 @@
-DIST qtwebkit-5.212.0-alpha2.tar.xz 12456284 BLAKE2B f8dab5acb62dc660d16c990af22ec6e9c478044b2829c6eb5ef82de9f72956cf4e91d245130a7a9ae01049e21644ae4afd92bf85c783ee5125d260edd1b885b4 SHA512 b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758
+DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
new file mode 100644
index 00000000..d8b5ba6c
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
@@ -0,0 +1,22 @@
+From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Fri, 26 Jan 2018 20:50:07 +0300
+Subject: [PATCH] Add missing #include <functional>
+
+Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f
+---
+ Source/WebCore/dom/SlotAssignment.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
+index 0fcd4dfa6de8..9b9ebe429816 100644
+--- a/Source/WebCore/dom/SlotAssignment.h
++++ b/Source/WebCore/dom/SlotAssignment.h
+@@ -28,6 +28,7 @@
+ 
+ #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ 
++#include <functional>
+ #include <wtf/HashMap.h>
+ #include <wtf/HashSet.h>
+ #include <wtf/Vector.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-fixes.patch b/dev-qt/qtwebkit/files/qtwebkit-fixes.patch
deleted file mode 100644
index a34c4810..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
---- a/Source/WebKit/PlatformQt.cmake	2017-06-09 15:11:36.000000000 +0100
-+++ b/Source/WebKit/PlatformQt.cmake	2018-04-26 20:40:30.062720394 +0100
-@@ -786,6 +786,7 @@
-     set_source_files_properties(
-         qt/Api/qwebdatabase.cpp
-         qt/Api/qwebelement.cpp
-+        qt/Api/qwebfullscreenrequest.cpp
-         qt/Api/qwebhistory.cpp
-         qt/Api/qwebhistoryinterface.cpp
-         qt/Api/qwebpluginfactory.cpp
-@@ -795,7 +796,6 @@
- 
-         qt/WidgetApi/qgraphicswebview.cpp
-         qt/WidgetApi/qwebframe.cpp
--        qt/WidgetApi/qwebfullscreenrequest.cpp
-         qt/WidgetApi/qwebinspector.cpp
-         qt/WidgetApi/qwebpage.cpp
-         qt/WidgetApi/qwebview.cpp
-diff -Nur a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
---- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp	2017-06-04 21:16:07.000000000 +0100
-+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp	2018-04-26 20:41:32.399699229 +0100
-@@ -961,6 +961,8 @@
-     FrameView* view = frame->view();
-     ASSERT(view);
-     view->resize(size);
-+    if (view->needsLayout())
-+        view->layout();
-     view->adjustViewSize();
- }
- 
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_alpha2-r1000.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_alpha2-r1000.ebuild
deleted file mode 100644
index 9f978bd6..00000000
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_alpha2-r1000.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic python-any-r1 ruby-single toolchain-funcs versionator
-
-MY_P="qtwebkit-5.212.0-alpha2" # FIXME: ${PV}
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://github.com/annulen/webkit"
-SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
-QV="5.2" # Minimum Qt version
-
-SLOT=5
-
-LICENSE="LGPL-2+ BSD"
-KEYWORDS="amd64"
-
-IUSE="+geolocation +gstreamer +jit +hyphen multimedia nsplugin orientation opengl +printsupport qml +webp X"
-
-REQUIRED_USE="
-	nsplugin? ( X )
-	qml? ( opengl )
-	?? ( gstreamer multimedia )
-"
-
-# Dependencies found at Source/cmake/OptionsQt.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	virtual/jpeg:0=
-	>=dev-qt/qtcore-${QV}
-	>=dev-qt/qtgui-${QV}
-	>=dev-qt/qtnetwork-${QV}
-	>=dev-qt/qtwidgets-${QV}
-
-	geolocation? ( >=dev-qt/qtpositioning-${QV} )
-	gstreamer? (
-		>=dev-libs/glib-2.36:2
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.6.0:1.0 )
-	hyphen? ( dev-libs/hyphen )
-	multimedia? ( >=dev-qt/qtmultimedia-${QV}[widgets] )
-	opengl? ( >=dev-qt/qtopengl-${QV} )
-	orientation? ( >=dev-qt/qtsensors-${QV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QV} )
-	qml? (
-		>=dev-qt/qtdeclarative-${QV}
-		>=dev-qt/qtwebchannel-${QV}[qml] )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender )
-"
-
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="1G" # Debug build requires much more see bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/qtwebkit-fixes.patch"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		-DENABLE_JIT=$(usex jit)
-		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_WEBKIT2=$(usex qml)
-		-DUSE_GSTREAMER=$(usex gstreamer)
-		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=Qt
-		${ruby_interpreter}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild
new file mode 100644
index 00000000..98972468
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+HOMEPAGE="https://www.qt.io/"
+SRC_URI="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+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"
+
+REQUIRED_USE="
+	nsplugin? ( X )
+	qml? ( opengl )
+	?? ( gstreamer multimedia )
+"
+
+# Dependencies found at Source/cmake/OptionsQt.cmake
+QT_MIN_VER="5.9.1:5"
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtcore-${QT_MIN_VER}
+	>=dev-qt/qtgui-${QT_MIN_VER}
+	>=dev-qt/qtnetwork-${QT_MIN_VER}
+	>=dev-qt/qtwidgets-${QT_MIN_VER}=
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	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=]
+	)
+	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+	qml? (
+		>=dev-qt/qtdeclarative-${QT_MIN_VER}
+		>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	dev-lang/perl
+	dev-util/gperf
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${COMMIT}
+
+PATCHES=( "${FILESDIR}/${P}-functional.patch" )
+
+CHECKREQS_DISK_BUILD="16G" # bug 417307
+
+_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"
+		check-reqs_$1
+	fi
+}
+
+pkg_pretend() {
+	_check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	_check_reqs pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix, bug #395875
+	tc-export CC
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local mycmakeargs=(
+		-DPORT=Qt
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		-DUSE_GSTREAMER=$(usex gstreamer)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
+		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
+		-DENABLE_WEBKIT2=$(usex qml)
+		$(cmake-utils_use_find_package webp WebP)
+		-DENABLE_X11_TARGET=$(usex X)
+	)
+
+	if has_version "virtual/rubygems[ruby_targets_ruby25]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
+	elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+	else
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# bug 572056
+	if [[ ! -f ${ED%/}$(qt5_get_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
+}
-- 
cgit v1.2.3