Package: guix-patches;
Reported by: Leo Famulari <leo <at> famulari.name>
Date: Sat, 15 Jan 2022 19:35:02 UTC
Severity: normal
Done: Leo Famulari <leo <at> famulari.name>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53289 in the body.
You can then email your comments to 53289 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
bug-guix <at> gnu.org
:bug#53289
; Package guix
.
(Sat, 15 Jan 2022 19:35:02 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
:bug-guix <at> gnu.org
.
(Sat, 15 Jan 2022 19:35:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: bug-guix <at> gnu.org Subject: Removing QtWebKit Date: Sat, 15 Jan 2022 14:34:24 -0500
We need to remove QtWebKit from the distro. The upstream project says this when you go to their download page: ------ WARNING: This release is based on old WebKit revision with known unpatched vulnerabilities. Please use it carefully and avoid visiting untrusted websites and using it for transmission of sensitive data. Please wait for new release from qtwebkit-dev branch to use it with untrusted content. ------ And a bit of discussion from the oss-sec mailing list [0], quoting here: ------ QtWebKit was a rendering engine for web content released with Qt until 5.6. It was replaced with QtWebEngine after that. Despite a community fork in 2016, nothing really happened to keep it alive and secure. ------ And: ------ Readers of this list will likely be familiar with the regular postings regarding WebKitGTK vulnerabilities: many of them are likely applicable to QtWebKit too, especially the WebKitGTK-based fork ------ So, the dozens (hundreds?) of notable security bugs fixed in WebKitGTK are totally unfixed in QtWebKit. Many of these bugs are considered "arbitrary code execution" bugs. And the broader context is that there won't be a future for this package, as Qt has abandoned WebKit in favor of Chromium. This package will not improve. If people want to keep using QtWebKit, they can maintain it in a channel. [0] https://seclists.org/oss-sec/2021/q3/66
bug-guix <at> gnu.org
:bug#53289
; Package guix
.
(Sat, 15 Jan 2022 19:40:02 GMT) Full text and rfc822 format available.Message #8 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: 53289 <at> debbugs.gnu.org Subject: [PATCH] gnu: Remove Qt WebKit. Date: Sat, 15 Jan 2022 14:38:48 -0500
Preliminary untested patch! * gnu/packages/qt.scm (qtwebkit): Remove variable. (python-pyqt)[inputs]: Remove qtwebkit. (python-pyqt-without-qtwebkit): Remove variable. * gnu/packages/kde-frameworks.scm (kdewebkit): Remove variable. * gnu/packages/engineering.scm (freecad)[inputs]: Remove qtwebkit. * gnu/packages/fcitx5.scm (fcitx5-qt)[inputs]: Remove qtwebkit. * gnu/packages/geo.scm (qgis): Remove qtwebkit. * gnu/packages/image-viewers.scm (luminance-hdr)[inputs]: Remove qtwebkit. * gnu/packages/kde-frameworks.scm (kdesignerplugin)[inputs]: Remove qtwebkit and kdewebkit. * gnu/packages/kde-internet.scm (sonnet)[inputs]: Remove qtwebkit. (ktorrent)[inputs]: Remove qtwebkit and kdewebkit. (choqok)[inputs]: Remove kdewebkit. * gnu/packages/kde-multimedia.scm (k3b)[inputs]: Remove qtwebkit. * gnu/packages/kde-pim.scm (kmessagelib)[inputs]: Remove qtwebkit. * gnu/packages/kde-pim.scm (libksysguard)[inputs]: Remove qtwebkit. * gnu/packages/kde.scm (kdenlive)[inputs]: Likewise. (kdevelop)[inputs]: Likewise. * gnu/packages/messaging.scm (psi)[inputs]: Remove qtwebkit. * gnu/packages/radio.scm (dream)[inputs]: Remove qtwebkit. (gnuradio): Replace python-pyqt-without-qtwebkit with python-pyqt. * gnu/packages/robotics.scm (aseba)[inputs]: Remove qtwebkit. * gnu/packages/sync.scm (nextcloud-client)[inputs]: Remove qtwebkit. (qsyncthingtray)[inputs]: Remove qtwebkit. * gnu/packages/syndication.scm (quiterss)[inputs]: Remove qtwebkit. * gnu/packages/tex.scm (texmaker)[inputs]: Remove qtwebkit. * gnu/packages/video.scm (shotcut)[inputs]: Remove qtwebkit. * gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch, gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch, gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch, gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch, gnu/packages/patches/qtwebkit-pbutils-include.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 5 - gnu/packages/engineering.scm | 1 - gnu/packages/fcitx5.scm | 3 +- gnu/packages/geo.scm | 1 - gnu/packages/image-viewers.scm | 1 - gnu/packages/kde-frameworks.scm | 34 ---- gnu/packages/kde-internet.scm | 4 - gnu/packages/kde-multimedia.scm | 1 - gnu/packages/kde-pim.scm | 1 - gnu/packages/kde-plasma.scm | 1 - gnu/packages/kde.scm | 2 - gnu/packages/messaging.scm | 1 - ...qtwebkit-fix-building-with-bison-3.7.patch | 54 ------- ...qtwebkit-fix-building-with-glib-2.68.patch | 21 --- .../qtwebkit-fix-building-with-icu-68.patch | 152 ------------------ ...twebkit-fix-building-with-python-3.9.patch | 35 ---- .../patches/qtwebkit-pbutils-include.patch | 15 -- gnu/packages/qt.scm | 93 ----------- gnu/packages/radio.scm | 2 - gnu/packages/robotics.scm | 1 - gnu/packages/sync.scm | 3 +- gnu/packages/syndication.scm | 2 +- gnu/packages/tex.scm | 2 +- gnu/packages/video.scm | 1 - 24 files changed, 4 insertions(+), 432 deletions(-) delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch delete mode 100644 gnu/packages/patches/qtwebkit-pbutils-include.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0eed20e7af..ea0bde5313 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1731,11 +1731,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ - %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 \ %D%/packages/patches/ragel-char-signedness.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/range-v3-build-with-gcc10.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d27ad677bb..ac695a2c73 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2485,7 +2485,6 @@ (define-public freecad python-wrapper qtbase-5 qtsvg - qtwebkit qtx11extras qtxmlpatterns sqlite diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 92fc0ea171..82a0192359 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -304,8 +304,7 @@ (define-public fcitx5-chinese-addons ("libpthread-stubs" ,libpthread-stubs) ("opencc" ,opencc) ("qtbase" ,qtbase-5) - ("fcitx5-qt" ,fcitx5-qt) - ("qtwebkit" ,qtwebkit))) + ("fcitx5-qt" ,fcitx5-qt))) (native-inputs (list extra-cmake-modules pkg-config)) (outputs '("out" "gui")) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index fbe63ce184..225f5e2c2b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2485,7 +2485,6 @@ (define-public qgis qtlocation qtserialport qtsvg - qtwebkit qwt ;;("saga" ,saga) sqlite)) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index b61a79370d..2077e462dc 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -607,7 +607,6 @@ (define-public luminance-hdr `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg) - ("qtwebkit" ,qtwebkit) ("boost" ,boost) ("eigen" ,eigen) ;; ("gtest" ,gtest) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 65937f8970..c49e9c5602 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2359,10 +2359,8 @@ (define-public kdesignerplugin kio kplotting ktextwidgets - kdewebkit kwidgetsaddons kxmlgui - qtwebkit sonnet)) (home-page "https://community.kde.org/Frameworks") (synopsis "Integrating KDE frameworks widgets with Qt Designer") @@ -2399,38 +2397,6 @@ (define-public kdesu with su and ssh respectively.") (license license:lgpl2.1+))) -(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+))) - (define-public kemoticons (package (name "kemoticons") diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 4e08bd5337..3e1cc45d88 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -70,7 +70,6 @@ (define-public choqok kcmutils kconfigwidgets kcoreaddons - kdewebkit kemoticons kglobalaccel kguiaddons @@ -90,7 +89,6 @@ (define-public choqok qoauth qtbase-5 qtnetworkauth - qtwebkit sonnet)) (home-page "https://kde.org/applications/internet/org.kde.choqok") (synopsis "Micro-Blogging Client") @@ -385,7 +383,6 @@ (define-public ktorrent kcoreaddons kcrash kdbusaddons - kdewebkit kdnssd ki18n kiconthemes @@ -405,7 +402,6 @@ (define-public ktorrent phonon qtbase-5 qtscript - qtwebkit solid syndication taglib)) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index e7a2b943e0..4638298939 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -421,7 +421,6 @@ (define-public k3b libvorbis oxygen-icons ; default icon set qtbase-5 - qtwebkit shared-mime-info solid sox diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index b17b18bd12..40abfdd899 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1325,7 +1325,6 @@ (define-public kmessagelib qtdeclarative qtwebchannel qtwebengine - qtwebkit sonnet)) (arguments `(#:tests? #f ;TODO many test fail for quite different reasons diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 5621d8ea35..1eaff4f69b 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -251,7 +251,6 @@ (define-public libksysguard ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript) - ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("plasma" ,plasma-framework) ("zlib" ,zlib))) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8dfcba1388..a8b584d8ec 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -264,7 +264,6 @@ (define-public kdenlive qtquickcontrols2 qtscript qtsvg - qtwebkit shared-mime-info)) (arguments ;; XXX: there is a single test that spawns other tests and @@ -343,7 +342,6 @@ (define-public kdevelop ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement - ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) ;; recommendes diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2fe0d35a10..56f8fbd905 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -227,7 +227,6 @@ (define-public psi ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) - ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("x11" ,libx11) ("xext" ,libxext) diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch b/gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch deleted file mode 100644 index ddaf8e2849..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 <at> 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; -- --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/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch b/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch deleted file mode 100644 index 63840f4bbc..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch +++ /dev/null @@ -1,21 +0,0 @@ -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); -- - namespace WTF { - - enum GRefPtrAdoptType { GRefPtrAdopt }; diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch b/gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch deleted file mode 100644 index acbfc4c4c8..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch +++ /dev/null @@ -1,152 +0,0 @@ -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 <at> 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 <at> gentoo.org> -Closes: https://bugs.gentoo.org/753260 -Package-Manager: Portage-3.0.9, Repoman-3.0.2 -Signed-off-by: Andreas Sturmlechner <asturm <at> 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->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 int64_t uTextLatin1ContextAwareNativeLength(UText* text) - 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 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo - 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) -diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -index 7aaac48..9ae0d36 100644 ---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) - 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 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo - 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) diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch b/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch deleted file mode 100644 index 9f9674de33..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix building with Python 3.9: - -https://github.com/qtwebkit/qtwebkit/issues/993 - -Patch copied from upstream source repository: - -https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd - -From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev <annulen <at> 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 c5dab429c7b0f..af3431275ecf9 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/gnu/packages/patches/qtwebkit-pbutils-include.patch b/gnu/packages/patches/qtwebkit-pbutils-include.patch deleted file mode 100644 index 57961e7a51..0000000000 --- a/gnu/packages/patches/qtwebkit-pbutils-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch taken from Nix: - https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch - -diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake ---- a/Source/WebKit2/PlatformQt.cmake -+++ b/Source/WebKit2/PlatformQt.cmake -@@ -261,6 +261,7 @@ - list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS} - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - ${SQLITE_INCLUDE_DIR} - diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 01bf961bbf..3550259772 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2073,7 +2073,6 @@ (define-public python-pyqt ("qtsvg" ,qtsvg) ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) - ("qtwebkit" ,qtwebkit) ("qtwebsockets" ,qtwebsockets) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns))) @@ -2231,15 +2230,6 @@ (define-public python-pyqtwebengine itself.") (license license:gpl3))) -;; XXX: This is useful because qtwebkit does not build reliably at this time. -;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* -;; packages that could be used together. -(define-public python-pyqt-without-qtwebkit - (package/inherit python-pyqt - (name "python-pyqt-without-qtwebkit") - (inputs - (alist-delete "qtwebkit" (package-inputs python-pyqt))))) - (define-public python-pyqt-builder (package (name "python-pyqt-builder") @@ -2609,89 +2599,6 @@ (define-public qwt ;; textengines/mathml/qwt_mml_document.{cpp,h} is dual LGPL2.1/GPL3 (either). license:lgpl2.1 license:gpl3)))) -(define-public qtwebkit - (package - (name "qtwebkit") - (version "5.212.0-alpha4") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/annulen/webkit/releases/download/" - "qtwebkit-" version "/qtwebkit-" version ".tar.xz")) - (sha256 - (base32 - "1rm9sjkabxna67dl7myx9d9vpdyfxfdhrk9w7b94srkkjbd2d8cw")) - (patches (search-patches "qtwebkit-pbutils-include.patch" - "qtwebkit-fix-building-with-bison-3.7.patch" - "qtwebkit-fix-building-with-glib-2.68.patch" - "qtwebkit-fix-building-with-icu-68.patch" - "qtwebkit-fix-building-with-python-3.9.patch")))) - (build-system cmake-build-system) - (native-inputs - (list perl - python - ruby - bison - flex - gperf - pkg-config)) - (inputs - `(("icu" ,icu4c) - ("glib" ,glib) - ("gst-plugins-base" ,gst-plugins-base) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libwebp" ,libwebp) - ("sqlite" ,sqlite) - ("fontconfig" ,fontconfig) - ("libxrender" ,libxrender) - ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) - ("qtlocation" ,qtlocation) - ("qtmultimedia" ,qtmultimedia) - ("qtsensors" ,qtsensors) - ("qtwebchannel" ,qtwebchannel) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite))) - (arguments - `(#:tests? #f ; no apparent tests; it might be necessary to set - ; ENABLE_API_TESTS, see CMakeLists.txt - - ;; Parallel builds fail due to a race condition: - ;; <https://bugs.gnu.org/34062>. - #:parallel-build? #f - - #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE" - "-DPORT=Qt" - "-DUSE_LIBHYPHEN=OFF" - "-DUSE_SYSTEM_MALLOC=ON" - ;; XXX: relative dir installs to build dir? - (string-append "-DECM_MKSPECS_INSTALL_DIR=" - %output "/lib/qt5/mkspecs/modules") - ;; Sacrifice a little speed in order to link - ;; libraries and test executables in a - ;; reasonable amount of memory. - "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory" - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory"))) - (home-page "https://www.webkit.org") - (synopsis "Web browser engine and classes to render and interact with web -content") - (description "QtWebKit provides a Web browser engine that makes it easy to -embed content from the World Wide Web into your Qt application. At the same -time Web content can be enhanced with native controls.") - ;; Building QtWebKit takes around 13 hours on an AArch64 machine. Give some - ;; room for slower or busy hardware. - (properties '((timeout . 64800))) ;18 hours - - ;; XXX: This consumes too much RAM to successfully build on AArch64 (e.g., - ;; SoftIron OverDrive with 8 GiB of RAM), so instead of wasting resources, - ;; disable it on non-Intel platforms. - (supported-systems '("x86_64-linux" "i686-linux")) - - (license license:lgpl2.1+))) - (define-public dotherside (package (name "dotherside") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index b40332aee8..c2039a2411 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -523,7 +523,6 @@ (define-public gnuradio ("python-numpy" ,python-numpy) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) - ("python-pyqt" ,python-pyqt-without-qtwebkit) ("python-pyqtgraph" ,python-pyqtgraph) ("python-pyyaml" ,python-pyyaml) ("qtbase" ,qtbase-5) @@ -1647,7 +1646,6 @@ (define-public dream pulseaudio qtbase-5 qtsvg - qtwebkit qwt speexdsp zlib)) diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index a110d0e6bd..4f45ca5d5c 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -109,7 +109,6 @@ (define-public aseba qtbase-5 qtsvg qttools ;for libQt5Help, needed by "studio" - qtwebkit qtx11extras eudev libxml2 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 165be17e4c..ea30fe5b42 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -199,7 +199,6 @@ (define-public nextcloud-client qtsvg qtwebchannel qtwebsockets - qtwebkit sqlite xdg-utils zlib)) @@ -394,7 +393,7 @@ (define-public qsyncthingtray #t)))) #:tests? #f)) ; no test target (inputs - (list qtbase-5 qtwebkit)) + (list qtbase-5)) (home-page "https://github.com/sieren/QSyncthingTray") (synopsis "Traybar Application for Syncthing") (description diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 6d4a61efbd..d344449d00 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -553,7 +553,7 @@ (define-public quiterss (native-inputs (list pkg-config qttools)) (inputs - (list qtwebkit qtbase-5 qtmultimedia phonon sqlite)) + (list qtbase-5 qtmultimedia phonon sqlite)) (home-page "https://quiterss.org/") (synopsis "RSS/Atom news feeds reader written on Qt/C++") (description "QuiteRSS is an RSS/Atom news feeds reader written on Qt/C++ diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6601a49c59..2298f000eb 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7281,7 +7281,7 @@ (define-public texmaker (string-append "METAINFODIR=" out "/share/metainfo") "texmaker.pro"))))))) (inputs - (list poppler-qt5 qtbase-5 qtscript qtwebkit zlib)) + (list poppler-qt5 qtbase-5 qtscript zlib)) (native-inputs (list pkg-config)) (home-page "http://www.xm1math.net/texmaker/") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a9996e477e..0b83bda5a1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4880,7 +4880,6 @@ (define-public shotcut qtquickcontrols qtquickcontrols2 qtsvg - qtwebkit qtwebsockets qtx11extras sdl2)) -- 2.34.0
bug-guix <at> gnu.org
:bug#53289
; Package guix
.
(Sat, 15 Jan 2022 20:39:01 GMT) Full text and rfc822 format available.Message #11 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: 53289 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Remove Qt WebKit. Date: Sat, 15 Jan 2022 15:37:54 -0500
On Sat, Jan 15, 2022 at 02:38:48PM -0500, Leo Famulari wrote: > Preliminary untested patch! I applied the patch and tried building all packages that are changed by the it. New failures: qgis quiterss kdevelop psi qsyncthingtray freecad Still succeeding (there could be some run-time breakage, however): shotcut texmaker nextcloud-client gnuradio dream kdenlive libksysguard k3b choqok ktorrent sonnet kdesignerplugin fcitx5-qt python-pyqt Still failing (we should remove these packages now if they don't build): luminance-hdr aseba kmessagelib
bug-guix <at> gnu.org
:bug#53289
; Package guix
.
(Wed, 19 Jan 2022 12:31:02 GMT) Full text and rfc822 format available.Message #14 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Guillaume Le Vaillant <glv <at> posteo.net> To: Leo Famulari <leo <at> famulari.name> Cc: 53289 <at> debbugs.gnu.org Subject: Re: bug#53289: [PATCH] gnu: Remove Qt WebKit. Date: Wed, 19 Jan 2022 12:19:01 +0000
[Message part 1 (text/plain, inline)]
Leo Famulari <leo <at> famulari.name> skribis: > I applied the patch and tried building all packages that are changed by > the it. > > New failures: > qgis > [...] For qgis, adding "-DWITH_QTWEBKIT=NO" to 'configure-flags' should work, but I don't know what features would then be unavailable in the application.
[signature.asc (application/pgp-signature, inline)]
bug-guix <at> gnu.org
:bug#53289
; Package guix
.
(Wed, 19 Jan 2022 15:58:03 GMT) Full text and rfc822 format available.Message #17 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Guillaume Le Vaillant <glv <at> posteo.net> To: Leo Famulari <leo <at> famulari.name> Cc: 53289 <at> debbugs.gnu.org Subject: Re: bug#53289: [PATCH] gnu: Remove Qt WebKit. Date: Wed, 19 Jan 2022 15:54:46 +0000
[Message part 1 (text/plain, inline)]
Leo Famulari <leo <at> famulari.name> skribis: > New failures: > [...] > freecad For freecad, the qtwebkit input can be replaced by qtdeclarative, qtwebchannel and qtwebengine.
[signature.asc (application/pgp-signature, inline)]
bug-guix <at> gnu.org
:bug#53289
; Package guix
.
(Sun, 23 Jan 2022 19:18:02 GMT) Full text and rfc822 format available.Message #20 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: Leo Famulari <leo <at> famulari.name> Cc: 53289 <at> debbugs.gnu.org Subject: Re: bug#53289: Removing QtWebKit Date: Sun, 23 Jan 2022 21:16:18 +0200
[Message part 1 (text/plain, inline)]
On Sat, Jan 15, 2022 at 02:34:24PM -0500, Leo Famulari wrote: > We need to remove QtWebKit from the distro. > I'll be happy to see it removed. -- Efraim Flashner <efraim <at> flashner.co.il> רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]
bug-guix <at> gnu.org
:bug#53289
; Package guix
.
(Mon, 24 Jan 2022 08:14:02 GMT) Full text and rfc822 format available.Message #23 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Guillaume Le Vaillant <glv <at> posteo.net> Cc: 53289 <at> debbugs.gnu.org Subject: Re: bug#53289: [PATCH] gnu: Remove Qt WebKit. Date: Mon, 24 Jan 2022 03:13:27 -0500
[Message part 1 (text/plain, inline)]
On Wed, Jan 19, 2022 at 03:54:46PM +0000, Guillaume Le Vaillant wrote: > Leo Famulari <leo <at> famulari.name> skribis: > > > New failures: > > [...] > > freecad > > For freecad, the qtwebkit input can be replaced by qtdeclarative, > qtwebchannel and qtwebengine. Thanks, I sent a patch as <https://issues.guix.gnu.org/53495>.
[signature.asc (application/pgp-signature, inline)]
Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Mon, 24 Jan 2022 08:14:02 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Mon, 24 Jan 2022 20:20:01 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Tue, 25 Jan 2022 20:15:01 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Tue, 25 Jan 2022 20:16:02 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Sun, 30 Jan 2022 00:27:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org
:bug#53289
; Package guix-patches
.
(Mon, 01 Aug 2022 04:20:01 GMT) Full text and rfc822 format available.Message #36 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Efraim Flashner <efraim <at> flashner.co.il> Cc: 53289 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name> Subject: Re: bug#53289: Removing QtWebKit Date: Mon, 01 Aug 2022 00:19:04 -0400
Hi, Efraim Flashner <efraim <at> flashner.co.il> writes: > On Sat, Jan 15, 2022 at 02:34:24PM -0500, Leo Famulari wrote: >> We need to remove QtWebKit from the distro. >> > > I'll be happy to see it removed. I don't have a strong opinion, but since it appears ill-maintained (and security-sensitive), OK with me. Thanks, Maxim
Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Tue, 14 Feb 2023 21:35:01 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Tue, 14 Feb 2023 21:47:01 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Tue, 14 Feb 2023 21:54:01 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
to control <at> debbugs.gnu.org
.
(Wed, 15 Feb 2023 18:44:01 GMT) Full text and rfc822 format available.Leo Famulari <leo <at> famulari.name>
:Leo Famulari <leo <at> famulari.name>
:Message #49 received at 53289-done <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: 53289-done <at> debbugs.gnu.org Subject: Re: Removing QtWebKit Date: Fri, 17 Feb 2023 14:53:04 -0500
On Sat, Jan 15, 2022 at 02:34:24PM -0500, Leo Famulari wrote: > We need to remove QtWebKit from the distro. Done with commit 861d6fa92c465920e65db47ee4fac531156500ec
guix-patches <at> gnu.org
:bug#53289
; Package guix-patches
.
(Fri, 17 Feb 2023 21:37:01 GMT) Full text and rfc822 format available.Message #52 received at 53289 <at> debbugs.gnu.org (full text, mbox):
From: Tobias Geerinckx-Rice <me <at> tobias.gr> To: 53289 <at> debbugs.gnu.org, leo <at> famulari.name Subject: Re: bug#53289: Removing QtWebKit Date: Fri, 17 Feb 2023 22:36:10 +0100
On 2023-02-17 20:53, Leo Famulari wrote: > On Sat, Jan 15, 2022 at 02:34:24PM -0500, Leo Famulari wrote: >> We need to remove QtWebKit from the distro. > > Done with commit 861d6fa92c465920e65db47ee4fac531156500ec Thank you for seeing this through. Kind regards, T G-R Sent from a Web browser. Excuse or enjoy my brevity.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org
.
(Sat, 18 Mar 2023 11:24:14 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.