diff options
author | Britney Fransen <brfransen@gmail.com> | 2023-07-12 19:31:05 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2023-07-12 19:31:05 (GMT) |
commit | 282500bf5193efabfa504b0de97caab8e1bde906 (patch) | |
tree | 0670a04648da4d1f85b10130ba2eea7fb0449d8c /linhes | |
parent | cc21ee5e41578eab88171439c3b5909e8ea06382 (diff) | |
download | linhes_pkgbuild-282500bf5193efabfa504b0de97caab8e1bde906.zip linhes_pkgbuild-282500bf5193efabfa504b0de97caab8e1bde906.tar.gz linhes_pkgbuild-282500bf5193efabfa504b0de97caab8e1bde906.tar.bz2 |
qt5-webkit: remove
Diffstat (limited to 'linhes')
-rw-r--r-- | linhes/qt5-webkit/PKGBUILD | 56 | ||||
-rw-r--r-- | linhes/qt5-webkit/glib-2.68.patch | 26 | ||||
-rw-r--r-- | linhes/qt5-webkit/icu68.patch | 170 | ||||
-rw-r--r-- | linhes/qt5-webkit/qt5-webkit-bison-3.7.patch | 46 | ||||
-rw-r--r-- | linhes/qt5-webkit/qt5-webkit-python-3.9.patch | 27 |
5 files changed, 0 insertions, 325 deletions
diff --git a/linhes/qt5-webkit/PKGBUILD b/linhes/qt5-webkit/PKGBUILD deleted file mode 100644 index 466f53e..0000000 --- a/linhes/qt5-webkit/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -# Contributor: Zen Wen <zen.8841@gmail.com> -# Contributor: Felix Yan <felixonmars@archlinux.org> -# Contributor: Antonio Rojas <arojas@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=qt5-webkit -_pkgver=5.212.0-alpha4 -_basever=5.15.3 -pkgver=${_pkgver/-/} -pkgrel=19 -arch=(x86_64) -url='https://github.com/qtwebkit/qtwebkit' -license=(GPL3 LGPL3 FDL custom) -pkgdesc='Classes for a WebKit2 based implementation and a new QML API' -source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz" - "https://src.fedoraproject.org/rpms/qt5-qtwebkit/raw/rawhide/f/qtwebkit-cstdint.patch" - icu68.patch - glib-2.68.patch - qt5-webkit-python-3.9.patch - qt5-webkit-bison-3.7.patch) -depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2) -makedepends=(cmake ruby gperf python qt5-doc qt5-tools) -optdepends=('gst-plugins-good: Webm codec support') -sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6' - '4c71c958eae45cae65c9f002024eb1369d06029b668e595158138ff7971e64f1' - '0b40ed924f03ff6081af610bb0ee01560b7bd1fb68f8af02053304a01d4ccdf0' - '4969dd03e482155e2490b50307dada81dda7bbc9e5398e3a53c20bc474f7c04e' - '6e0cee08e4fa57b04752e80817f33562f48aa42608a3a620930b6040259b4932' - '34f37b53ee0bc31c63ce85ebd1ae95543a8ba28483e387b20efd50574bd813be') -options=(!lto) - -prepare() { - cd qtwebkit-$_pkgver - patch -p0 -i ../icu68.patch # Fix build with ICU 68.x - patch -p1 -i ../glib-2.68.patch # https://github.com/qtwebkit/qtwebkit/issues/1057 - patch -p1 -i ../qt5-webkit-python-3.9.patch # Fix build with python 3.9 - patch -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build with bison 3.7 - patch -p1 -i ../qtwebkit-cstdint.patch # gcc 11.1 -} - -build() { - cmake -B build -S qtwebkit-$_pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \ - -DPORT=Qt \ - -DENABLE_TOOLS=OFF - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} -} diff --git a/linhes/qt5-webkit/glib-2.68.patch b/linhes/qt5-webkit/glib-2.68.patch deleted file mode 100644 index 3df6078..0000000 --- a/linhes/qt5-webkit/glib-2.68.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/linhes/qt5-webkit/icu68.patch b/linhes/qt5-webkit/icu68.patch deleted file mode 100644 index 25f094d..0000000 --- a/linhes/qt5-webkit/icu68.patch +++ /dev/null @@ -1,170 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: -Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' - ucnv_setFallback(m_converterICU, TRUE); - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: -In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: -Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: -Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ - ---- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC -+++ 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) ---- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC -+++ Source/WebCore/platform/text/icu/UTextProvider.h -@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text - // 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 - // 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; - } - } ---- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC -+++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i - 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 i - - 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(UTe - 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 - 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) ---- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC -+++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng - 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, - 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/linhes/qt5-webkit/qt5-webkit-bison-3.7.patch b/linhes/qt5-webkit/qt5-webkit-bison-3.7.patch deleted file mode 100644 index 13dd681..0000000 --- a/linhes/qt5-webkit/qt5-webkit-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 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/linhes/qt5-webkit/qt5-webkit-python-3.9.patch b/linhes/qt5-webkit/qt5-webkit-python-3.9.patch deleted file mode 100644 index bad26ef..0000000 --- a/linhes/qt5-webkit/qt5-webkit-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 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())) - |