Removing QtWebKit

--- a/gnu/local.mk

- %D%/packages/patches/qtwebkit-pbutils-include.patch \

- %D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \

- %D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \

- %D%/packages/patches/qtwebkit-fix-building-with-icu-68.patch \

- %D%/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch \

--- a/gnu/packages/engineering.scm

- qtwebkit

--- a/gnu/packages/fcitx5.scm

- ("fcitx5-qt" ,fcitx5-qt)

- ("qtwebkit" ,qtwebkit)))

--- a/gnu/packages/geo.scm

- qtwebkit

--- a/gnu/packages/image-viewers.scm

- ("qtwebkit" ,qtwebkit)

--- a/gnu/packages/kde-frameworks.scm

- kdewebkit

- qtwebkit

-(define-public kdewebkit

- (package

- (name "kdewebkit")

- (version "5.70.0")

- (source (origin

- (method url-fetch)

- (uri (string-append

- "mirror://kde/stable/frameworks/"

- (version-major+minor version) "/portingAids/"

- name "-" version ".tar.xz"))

- (sha256

- (base32

- "0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008"))))

- (build-system cmake-build-system)

- (native-inputs

- (list extra-cmake-modules qttools))

- (inputs

- (list kconfig

- kcoreaddons

- kio

- kjobwidgets

- kparts

- kservice

- kwallet

- qtbase-5

- qtwebkit))

- (home-page "https://community.kde.org/Frameworks")

- (synopsis "KDE Integration for QtWebKit")

- (description "This library provides KDE integration of the HTML rendering

-engine WebKit via QtWebKit.")

- (license license:lgpl2.1+)))

-

--- a/gnu/packages/kde-internet.scm

- kdewebkit

- qtwebkit

- kdewebkit

- qtwebkit

--- a/gnu/packages/kde-multimedia.scm

- qtwebkit

--- a/gnu/packages/kde-pim.scm

- qtwebkit

--- a/gnu/packages/kde-plasma.scm

- ("qtwebkit" ,qtwebkit)

--- a/gnu/packages/kde.scm

- qtwebkit

- ("qtwebkit" ,qtwebkit)

--- a/gnu/packages/messaging.scm

- ("qtwebkit" ,qtwebkit)

--- a/gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch

-Fix build with Bison 3.7

-

-https://bugs.gentoo.org/736499

-

-Patch copied from upstream source repository:

-

-https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31

-

-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 5d63b08102eb5..9435701c70612 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;

--- a/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch

-Fix building with glib 2.68:

-

-https://github.com/qtwebkit/qtwebkit/issues/1057

-

-Patch copied from upstream pull request:

-

-https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b

-

-diff -aurN qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h

---- qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h 2020-03-04 18:16:37.000000000 +0100

-+++ qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h 2021-04-05 06:58:44.763328636 +0200

-@@ -29,9 +29,6 @@

- #include <wtf/RefPtr.h>

- #include <algorithm>

-

--extern "C" void g_object_unref(gpointer);

--extern "C" gpointer g_object_ref_sink(gpointer);

--- a/gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch

-Fix building with ICU > 68.

-

-https://bugs.gentoo.org/753260

-

-Patch adapted from Gentoo:

-

-https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335f29d266c5b169ff1e781f9851a3a203f3198c

-

-From 335f29d266c5b169ff1e781f9851a3a203f3198c Mon Sep 17 00:00:00 2001

-From: Andreas Sturmlechner <asturm@gentoo.org>

-Date: Fri, 6 Nov 2020 09:22:15 +0100

-Subject: dev-qt/qtwebkit: Fix build with ICU-68

-

-Thanks-to: Lars Wendler <polynomial-c@gentoo.org>

-Closes: https://bugs.gentoo.org/753260

-Package-Manager: Portage-3.0.9, Repoman-3.0.2

-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

----

- .../qtwebkit-5.212.0_pre20200309-icu-68.patch | 120 +++++++++++++++++++++

- 1 file changed, 120 insertions(+)

- create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch

-

-(limited to 'dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch')

-

-diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp

-index dd6ff06..e0f4bd7 100644

---- a/Source/WebCore/platform/text/TextCodecICU.cpp

-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp

-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const

- 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/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h

-index c254fc4..6d1e1cb 100644

---- a/Source/WebCore/platform/text/icu/UTextProvider.h

-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h

-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int

- // 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 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int

- // 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;

- }

- }

-diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp

-index cd6852c..6a864b1 100644

---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp

-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp

-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)

- 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 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)

-

- uText