diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
commit | e23a08d0c97a0cc415aaa165da840b056f93c997 (patch) | |
tree | 4c5f7db60483518201fef36f8cc0712789a08db2 /dev-qt/qtwebkit | |
parent | 391b5b359a346aff490103da7dddc85047f83830 (diff) |
gentoo resync : 08.10.2021
Diffstat (limited to 'dev-qt/qtwebkit')
7 files changed, 0 insertions, 407 deletions
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest deleted file mode 100644 index ed75f0977669..000000000000 --- a/dev-qt/qtwebkit/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX qtwebkit-5.212.0_pre20200309-bison-3.7.patch 1613 BLAKE2B 0d2d173b5575ed5e1c52a07c5ceb14210bfb0a91e50a064df1e293451d64708822eb54d65947413efb13711d4c0c8e01441869248a4461446bd2bc122f07746b SHA512 cf21eff51e1026f4e506724a512b9925d4619909f5924bf01055244817ec9594e9d3ce105b510cd28ecce4772d122d1393fb7273501e20e16749f43282a3200b -AUX qtwebkit-5.212.0_pre20200309-glib-2.68.patch 887 BLAKE2B 1a191fd47693d70bc6ddbafcc8031bdd511c3be63121c1014471a93ebf3f1326a922277c42520a878192e0db4bb679cc007f27451ffac1aecdd86032b9d383c2 SHA512 7948ab8d40e954bfcafaceb69ea51991f45a684d8875d542bdf39af46266f5c312581662ea591a8199aa5e3583a6e3612e175f73a75b66ffd094e304aa7d67a9 -AUX qtwebkit-5.212.0_pre20200309-icu-68.patch 4981 BLAKE2B c031aa8ec816749fa35e3876d007a02d60a3a5ff0fc57a2774a13fc23559b39cc5bfeec6fedd96cb36d7eed5d1b388049d190673afbe5b0fd2f0343f8afd5344 SHA512 b1cf2a5c07e4876e74913687417ffd751e6dcb3fa783c545ba50064d31c9a4bb1515ce9c26b399f2b9b53b588791e4e6f571ad7cfe631087ecd3709bce675a9e -AUX qtwebkit-5.212.0_pre20200309-python-3.9.patch 1100 BLAKE2B 2b44f8614a81141fd372d97cec2661b712e3cc68a01d5ed83d89c778eacc218a95a3273b7f464bbcd5380806859a40598cc166a8473fb30e76ca7e6b002b460f SHA512 9bcb07cfa61684d154f9b80b231c32423a8b80820445372634ef620c11a9267e98ae0318e143e6358f0668b10f90a44b163f0eeeee5476a0b5fbd31af5c4bf9a -DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 -EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 4080 BLAKE2B ea006e78af9e3bbe63f7581377aeb006977ab5a6e4b1d5ee1d0930d95f98c44b56c44861422b245ef3e83318a4f6e3088f28e4e0a383b53b23c5c5e18e4c264a SHA512 b1f3b4ca60b6f6cfdb81a6194c8669304b3a84c9f06a4a741103ed3ad72804a03516577d8d94e3aa888c4da67d29ffccf15c2c825702a3a8b4508be0d5b4803c -MISC metadata.xml 1153 BLAKE2B ecb61fb573d5a621f242dd65e0d43336a454e15c26211f6a3e4fffe6fe3eb7b275b75fb6ef757ef91ae03f41284405b19e088b83d89d32998d29f2cd436f85f6 SHA512 05c8a167b1de78caeaa9cfde396f2ab5b57c3d2f5e12579951326606e1dc18e6aff29e1d011047d7ec82f9f6fe9841ba1dbd5cb42bd4cbe63f580a1cc618c0d3 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 de3bbcfc3ef1..000000000000 --- 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@gmail.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 f377a311362c..000000000000 --- 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@suse.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 7de72ea61aff..000000000000 --- 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 a3b677b779b1..000000000000 --- 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@yandex.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 8cf2db1a6114..000000000000 --- 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@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="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 f2e91b79caf5..000000000000 --- 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 -} |