[gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     7bb577b2feb4b285cccf466447ffe6998ac431bf
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  5 00:44:27 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan  5 00:44:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=7bb577b2

dev-qt/qtwebkit: drop in favor of qtwebengine

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 dev-qt/qtwebkit/Manifest                           |   1 -
 .../files/qtwebkit-5.4.2-system-leveldb.patch      |  25 -----
 ...webkit-5.5.0-fix-backtrace-detection-musl.patch |  22 ----
 .../files/qtwebkit-5.5.1-disable-jit.patch         |  15 ---
 .../files/qtwebkit-5.5.1-fix-stack-size-musl.patch |  14 ---
 .../files/qtwebkit-5.8.0-disable-gstreamer.patch   |  15 ---
 dev-qt/qtwebkit/metadata.xml                       |  28 -----
 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild              | 122 ---------------------
 8 files changed, 242 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
deleted file mode 100644
index 97b9f0e..0000000
--- a/dev-qt/qtwebkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5

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
deleted file mode 100644
index 265d507..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Correct header location so system dev-libs/leveldb can be detected.
-
---- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
-@@ -19,7 +19,7 @@
- 
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- 
- int main(int, char**)
- {
-
---- 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>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- #include <leveldb/slice.h>
- #include <string>
- #include <wtf/PassOwnPtr.h>

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch
deleted file mode 100644
index 73e085f..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/meta-qt5/meta-qt5/blob/master/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
-
---- a/Source/WTF/wtf/Assertions.cpp
-+++ b/Source/WTF/wtf/Assertions.cpp
-@@ -61,7 +61,7 @@
- #include <windows.h>
- #endif
- 
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
-     *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined

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
deleted file mode 100644
index 40e58f0..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/qtwebkit-5.5.1-fix-stack-size-musl.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch
deleted file mode 100644
index 68f8f6b..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
deleted file mode 100644
index 867e8dc..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 645be81..0000000
--- a/dev-qt/qtwebkit/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</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="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>
-		<flag name="qml">Build QML/QtQuick bindings</flag>
-		<flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag>
-		<flag name="webp">Add support for WebP image format</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>https://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.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
deleted file mode 100644
index 1dbdced..0000000
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 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 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
-}