[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/, profiles/

[Jakov Smolić]

commit:     782ad581f563b874a309931cd4ed49d95533df09
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  5 06:51:37 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Oct  5 07:36:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782ad581

dev-qt/qtwebkit: treeclean

Bug: https://bugs.gentoo.org/684580
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-qt/qtwebkit/Manifest                           |   1 -
 .../qtwebkit-5.212.0_pre20200309-bison-3.7.patch   |  46 -------
 .../qtwebkit-5.212.0_pre20200309-glib-2.68.patch   |  28 ----
 .../qtwebkit-5.212.0_pre20200309-icu-68.patch      | 120 ----------------
 .../qtwebkit-5.212.0_pre20200309-python-3.9.patch  |  27 ----
 dev-qt/qtwebkit/metadata.xml                       |  26 ----
 .../qtwebkit-5.212.0_pre20200309-r1.ebuild         | 153 ---------------------
 profiles/package.mask                              |   6 -
 8 files changed, 407 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
deleted file mode 100644
index 7080d4f542b..00000000000
--- a/dev-qt/qtwebkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
deleted file mode 100644
index de3bbcfc3ef..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57@×××××.com>
-Date: Tue, 4 Aug 2020 21:04:06 +0300
-Subject: [PATCH] Let Bison generate the header directly, to fix build with
- Bison 3.7
-
-Starting with Bison 3.7, the generated C++ file #include's the header
-by default, instead of duplicating it. So we should not delete it.
-
-Remove the code to add #ifdef guards to the header, since Bison adds
-them itself since version 2.6.3.
----
- Source/WebCore/css/makegrammar.pl | 21 +--------------------
- 1 file changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
-index 5d63b08102eb..9435701c7061 100644
---- a/Source/WebCore/css/makegrammar.pl
-+++ b/Source/WebCore/css/makegrammar.pl
-@@ -73,25 +73,6 @@
- }
- 
- my $fileBase = File::Spec->join($outputDir, $filename);
--my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
-+my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
- push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
- system(@bisonCommand) == 0 or die;
--
--open HEADER, ">$fileBase.h" or die;
--print HEADER << "EOF";
--#ifndef CSSGRAMMAR_H
--#define CSSGRAMMAR_H
--EOF
--
--open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
--while (<HPP>) {
--    print HEADER;
--}
--close HPP;
--
--print HEADER "#endif\n";
--close HEADER;
--
--unlink("$fileBase.cpp.h");
--unlink("$fileBase.hpp");
--

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
deleted file mode 100644
index f377a311362..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/qtwebkit/qtwebkit/pull/1058
-
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@××××.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
deleted file mode 100644
index 7de72ea61af..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/Source/WebCore/platform/text/icu/UTextProvider.h
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/TextCodecICU.cpp
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch
deleted file mode 100644
index a3b677b779b..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@××××××.ru>
-Date: Wed, 3 Jun 2020 15:01:42 +0300
-Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to
- json.load()
-
-In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument
-is not supported.
-
-Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9
----
- Source/JavaScriptCore/generate-bytecode-files | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files
-index c5dab429c7b0..af3431275ecf 100644
---- a/Source/JavaScriptCore/generate-bytecode-files
-+++ b/Source/JavaScriptCore/generate-bytecode-files
-@@ -163,7 +163,7 @@ if __name__ == "__main__":
-         initBytecodesFile = openOrExit(initASMFileName, "w")
- 
-     try:
--        bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")
-+        bytecodeSections = json.load(bytecodeFile)
-     except:
-         print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info()))
- 

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
deleted file mode 100644
index 8cf2db1a611..00000000000
--- a/dev-qt/qtwebkit/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@g.o</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<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</pkg> using SLOT 1.0</flag>
-		<flag name="hyphen">Enable hyphenation support via <pkg>dev-libs/hyphen</pkg></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>
-	</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.212.0_pre20200309-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
deleted file mode 100644
index f2e91b79caf..00000000000
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_BRANCH="qtwebkit-5.212"
-	EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git"
-	inherit git-r3
-else
-	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 ppc64 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-PYTHON_COMPAT=( python3_{7,8,9} )
-USE_RUBY="ruby25 ruby26 ruby27"
-inherit check-reqs cmake 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/"
-
-LICENSE="BSD LGPL-2+"
-SLOT="5/5.212"
-IUSE="geolocation gles2-only +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.12.3:5"
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	dev-lang/perl
-	dev-util/gperf
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-DEPEND="
-	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=
-	media-libs/woff2
-	virtual/jpeg:0
-	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
-	opengl? (
-		>=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} )
-	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
-	)
-"
-RDEPEND="${DEPEND}"
-
-CHECKREQS_DISK_BUILD="16G" # bug 417307
-
-PATCHES=(
-	"${FILESDIR}/${P}-bison-3.7.patch" # bug 736499
-	"${FILESDIR}/${P}-icu-68.patch" # bug 753260
-	"${FILESDIR}/${P}-python-3.9.patch" # bug 766303
-	"${FILESDIR}/${P}-glib-2.68.patch" # bug 777759
-)
-
-_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_TOOLS=OFF
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		-DUSE_GSTREAMER=$(usex gstreamer)
-		-DUSE_LIBHYPHEN=$(usex hyphen)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
-		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_PRINT_SUPPORT=$(usex printsupport)
-		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
-		-DENABLE_WEBKIT2=$(usex qml)
-		$(cmake_use_find_package webp WebP)
-		-DENABLE_X11_TARGET=$(usex X)
-	)
-
-	if has_version "virtual/rubygems[ruby_targets_ruby27]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) )
-	elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
-	else
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_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
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index c189dc7bbc5..89d8fb35718 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -334,12 +334,6 @@ games-puzzle/gnudoku
 # Preparing for final 5.0.0 release
 >=app-text/tesseract-5.0.0_beta
 
-# Andreas Sturmlechner <asturm@g.o> (2021-08-02)
-# No commits to upstream repository for >9 months, latest available tarball
-# still "alpha" with warning about known unpatched vulnerabilities. Bug #684580
-# Removal on 2021-10-04.
-dev-qt/qtwebkit:5
-
 # Joonas Niilola <juippis@g.o> (2021-07-29)
 # Upstream provided migration instructions from 2. -> 3. update,
 # breaks if not all at least many revdeps. #805011 for tracker bug.