Skip to contentSkip to conversation

package/qt5/qt5webkit: bump to version 5.212.0-alpha4

PATCH In review James Hilliard 2 participants 3 messages Jan 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5/qt5webkit: bump to version 5.212.0-alpha4

Switch to latest release in new active upstream:
https://github.com/qtwebkit/qtwebkit

Migrate python2 build to python3.

Drop patches that are upstream/no longer needed.

Adapt/add patches to fix build issues.

Rework build system to use cmake instead of qmake(which does not currently support cross compilation).

---
 ...compile-failures-from-capital-bool-d.patch | 147 ++++++++++++++++++
 ...0001-qtwebkit-fix-QA-issue-bad-RPATH.patch |  36 -----
 ...acktrace-API-for-non-glibc-libraries.patch |  44 ------
 ...with-Python-3.9-avoid-passing-encodi.patch |  33 ++++
 ...-Detect-32-bits-armv8-a-architecture.patch |  48 ------
 ...e-the-header-directly-to-fix-build-.patch} |  22 +--
 ...04-Fix-installation-of-class-headers.patch |  49 ------
 ..._object-declarations-to-fix-build-wi.patch |  31 ++++
 ...005-Fix-ICU-related-compile-failures.patch |  67 --------
 ...-legacy-reference-to-qtConfig-mircli.patch |  34 ----
 ...te-the-header-directly-to-fix-build-.patch |  31 ----
 ...compile-failures-from-capital-bool-d.patch |  99 ------------
 package/qt5/qt5webkit/Config.in               |  14 ++
 package/qt5/qt5webkit/qt5webkit.hash          |   4 +-
 package/qt5/qt5webkit/qt5webkit.mk            |  37 ++---
 15 files changed, 250 insertions(+), 446 deletions(-)
 create mode 100644 package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch
 delete mode 100644 package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
 delete mode 100644 package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
 create mode 100644 package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch
 delete mode 100644 package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch
 rename package/qt5/qt5webkit/{0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch => 0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch} (60%)
 delete mode 100644 package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch
 create mode 100644 package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch
 delete mode 100644 package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch
 delete mode 100644 package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch
 delete mode 100644 package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch
 delete mode 100644 package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch
package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch new file +147 -0
new file mode 100644
index 0000000000..11d0b7b248
@@ -0,0 +1,147 @@
+From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001
+From: Henri Roosen <[email protected]>
+Date: Thu, 18 Mar 2021 11:53:57 +0100
+Subject: [PATCH] Fix ICU related compile failures from capital bool defines
+
+See ICU-21267
+
+Signed-off-by: Henri Roosen <[email protected]>
+Signed-off-by: James Hilliard <[email protected]>
+---
+ Source/WebCore/platform/text/TextCodecICU.cpp      |  2 +-
+ Source/WebCore/platform/text/icu/UTextProvider.h   |  8 ++++----
+ .../platform/text/icu/UTextProviderLatin1.cpp      | 14 +++++++-------
+ .../platform/text/icu/UTextProviderUTF16.cpp       |  4 ++--
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
+index dd6ff0675bb1..e0f4bd718828 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 c254fc4c7ce2..6d1e1cbc5eb2 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 cd6852c71e55..6a864b1c1567 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 7aaac48c8151..9ae0d367f1f6 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)
+-- 
+2.25.1
+
package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch deleted +0 -36
deleted file mode 100644
index 669c7e6aa2..0000000000
@@ -1,36 +0,0 @@
-From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001
-From: Trevor Woerner <[email protected]>
-Date: Fri, 7 Feb 2014 04:07:17 +0100
-Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
-
-Building qtwebkit causes a QA issue such that QtWebPluginProcess and
-QtWebProcess contain bad RPATHs which point into the build location. This fix
-adds a patch to not include the rpath.prf which causes this problem.
-
-Signed-off-by: Trevor Woerner <[email protected]>
-Signed-off-by: Martin Jansa <[email protected]>
-
-Downloaded from:
-https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
-0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
-
-Signed-off-by: Gary Bisson <[email protected]>
----
- Tools/qmake/mkspecs/features/unix/default_post.prf | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
-index fd66af6..ef754c3 100644
---- a/Tools/qmake/mkspecs/features/unix/default_post.prf
-+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -61,7 +61,6 @@ linux-*g++* {
-     }
- }
- 
--contains(TEMPLATE, app): CONFIG += rpath
- 
- CONFIG(debug, debug|release)|force_debug_info {
-     # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
--- 
-2.7.0
-
package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted +0 -44

44 lines not on this page · raw message

package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch new file +33 -0
new file mode 100644
index 0000000000..d167a44bf3
@@ -0,0 +1,33 @@
+From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <[email protected]>
+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
+Signed-off-by: James Hilliard <[email protected]>
+[[email protected]: backport from upstream commit
+78360c01c796b6260bf828bc9c8a0ef73c5132fd]
+---
+ 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()))
+ 
+-- 
+2.25.1
+
package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch deleted +0 -48

48 lines not on this page · raw message

package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch renamed from package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch +11 -11
similarity index 60%
rename from package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch
rename to package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch
index 7bb81b1259..1591b8a82c 100644
@@ -1,4 +1,4 @@
-From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001
+From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
 From: Dmitry Shachnev <[email protected]>
 Date: Tue, 4 Aug 2020 21:04:06 +0300
 Subject: [PATCH] Let Bison generate the header directly, to fix build with
@@ -9,24 +9,25 @@ 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.
-
-[Original patch taken from
-https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88
-ported to qtwebkit-opensource-src-5.9.1]
-Signed-off-by: Peter Seiderer <[email protected]>
+Signed-off-by: James Hilliard <[email protected]>
+[[email protected]: backport from upstream commit
+d92b11fea65364fefa700249bd3340e0cd4c5b31]
 ---
  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 4e0452ed..9ef32963 100644
+index 5d63b08102eb..9435701c7061 100644
 --- a/Source/WebCore/css/makegrammar.pl
 +++ b/Source/WebCore/css/makegrammar.pl
-@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") {
+@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") {
  }
  
  my $fileBase = File::Spec->join($outputDir, $filename);
--system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp");
+-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";
@@ -46,7 +47,6 @@ index 4e0452ed..9ef32963 100644
 -unlink("$fileBase.cpp.h");
 -unlink("$fileBase.hpp");
 -
-+system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp");
 -- 
-2.28.0
+2.25.1
 
package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch deleted +0 -49

49 lines not on this page · raw message

package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch new file +31 -0
new file mode 100644
index 0000000000..48605e4fe4
@@ -0,0 +1,31 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <[email protected]>
+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.
+Signed-off-by: James Hilliard <[email protected]>
+[Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058]
+---
+ 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 };
+-- 
+2.25.1
+
package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch deleted +0 -67

67 lines not on this page · raw message

package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch deleted +0 -34
deleted file mode 100644
index d9b94697da..0000000000
@@ -1,34 +0,0 @@
-From c408484e3a442ecf99d3cc61402f20c45c894b7c Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <[email protected]>
-Date: Mon, 3 Feb 2020 21:19:57 +0100
-Subject: [PATCH] configure: remove legacy reference to qtConfig(mirclient)
-
-The optio mirclient is removed since Qt-5.14.x (see [1])
-Fixes:
-
-  Project ERROR: Could not find feature mirclient.
-
-[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405
-
-Signed-off-by: Peter Seiderer <[email protected]>
----
- Tools/qmake/mkspecs/features/configure.prf | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf
-index 23d99040..783f6752 100644
---- a/Tools/qmake/mkspecs/features/configure.prf
-+++ b/Tools/qmake/mkspecs/features/configure.prf
-@@ -130,9 +130,6 @@ defineTest(finalizeConfigure) {
-         addReasonForSkippingBuild("Build not supported on Android.")
-     }
-     QT_FOR_CONFIG += gui-private
--    production_build:qtConfig(mirclient) {
--        addReasonForSkippingBuild("Build not supported on Ubuntu Touch.")
--    }
-     !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) {
-         addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.")
-     }
--- 
-2.25.0
-
package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch deleted +0 -31
deleted file mode 100644
index 9deb2d8c63..0000000000
@@ -1,31 +0,0 @@
-From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <[email protected]>
-Date: Tue, 15 Sep 2020 19:11:18 +0200
-Subject: [PATCH] let bison generate the header directly, to fix build with
- bison 3.7
-
-Do the same as the patch taken from [1] for the bison call in
-Source/WebCore/DerivedSources.pri to fix file generation
-for bison 3.7.
-
-Signed-off-by: Peter Seiderer <[email protected]>
----
- Source/WebCore/DerivedSources.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri
-index 57a6b0f7..e9f52614 100644
---- a/Source/WebCore/DerivedSources.pri
-+++ b/Source/WebCore/DerivedSources.pri
-@@ -987,7 +987,7 @@ GENERATORS += pluginsresources
- # GENERATOR 11: XPATH grammar
- xpathbison.output = ${QMAKE_FILE_BASE}.cpp
- xpathbison.input = XPATHBISON
--xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h
-+xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp
- xpathbison.depends = ${QMAKE_FILE_NAME}
- GENERATORS += xpathbison
- 
--- 
-2.28.0
-
package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch deleted +0 -99

99 lines not on this page · raw message

package/qt5/qt5webkit/Config.in +14 -0
index 82e38dff52..b7beb2b252 100644
@@ -9,10 +9,24 @@ config BR2_PACKAGE_QT5WEBKIT
 	depends on !BR2_BINFMT_FLAT # icu
 	# assumes a FPU is available on MIPS
 	depends on !BR2_MIPS_SOFT_FLOAT
+	select BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	select BR2_PACKAGE_ICU
+	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LEVELDB
+	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_QT5BASE_ICU
 	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5LOCATION
+	select BR2_PACKAGE_QT5SENSORS
+	select BR2_PACKAGE_QT5WEBCHANNEL
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_WEBP
+	select BR2_PACKAGE_WEBP_DEMUX
+	select BR2_PACKAGE_WOFF2
+	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
 	help
package/qt5/qt5webkit/qt5webkit.hash +2 -2
index 312d58272a..d7c8bd6c8a 100644
@@ -1,5 +1,5 @@
-# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist
-sha256  28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf  qtwebkit-opensource-src-5.9.1.tar.xz
+# Locally calculated
+sha256  9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6  qtwebkit-5.212.0-alpha4.tar.xz
 
 # Hashes for license files:
 sha256  7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805  Source/WebCore/LICENSE-LGPL-2
package/qt5/qt5webkit/qt5webkit.mk +12 -25
index dd99661be0..3af1918a46 100644
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-QT5WEBKIT_VERSION = 5.9.1
-QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
-QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
+QT5WEBKIT_VERSION = 5.212.0-alpha4
+QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION)
+QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz
 QT5WEBKIT_DEPENDENCIES = \
-	host-bison host-flex host-gperf host-python host-ruby \
-	leveldb sqlite
+	host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \
+	gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \
+	qt5sensors qt5webchannel sqlite webp woff2
 QT5WEBKIT_INSTALL_STAGING = YES
 
 QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
@@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
 QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
 
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
-QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
+QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender
 endif
 
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
 QT5WEBKIT_DEPENDENCIES += qt5declarative
 endif
 
-# QtWebkit's build system uses python, but only supports python2. We work
-# around this by forcing python2 early in the PATH, via a python->python2
-# symlink.
-QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
-QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
-define QT5WEBKIT_PYTHON2_SYMLINK
-	mkdir -p $(@D)/host-bin
-	ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python
-endef
-QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
+QT5WEBKIT_CONF_OPTS += \
+	-DPORT=Qt \
+	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \
+	-DUSE_LIBHYPHEN=OFF
 
-QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb
-
-define QT5WEBKIT_INSTALL_TARGET_EXTRAS
-	cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/
-endef
-
-QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS
-
-$(eval $(qmake-package))
+$(eval $(cmake-package))
Signature · 7 lines
2.25.1


_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 2 lines · James Hilliard

Switch to latest release in new active upstream:
https://github.com/qtwebkit/qtwebkit

Perhaps you can push the remaining patch to upstream then?

Quoted 11 lines

Migrate python2 build to python3.

Drop patches that are upstream/no longer needed.

Adapt/add patches to fix build issues.

Rework build system to use cmake instead of qmake(which does not currently support cross compilation).

[snip]

package/qt5/qt5webkit/qt5webkit.mk line 8

Quoted 13 lines
package/qt5/qt5webkit/qt5webkit.mk +2 -3
index dd99661be0..3af1918a46 100644
@@ -4,12 +4,13 @@
  #
  ################################################################################
 
-QT5WEBKIT_VERSION = 5.9.1
-QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
-QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
+QT5WEBKIT_VERSION = 5.212.0-alpha4
+QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION)

Upstream README says:

Use the following repository if you need to get latest snapshots of QtWebKit code:

http://code.qt.io/cgit/qt/qtwebkit.git/

This repo aslo has a 5.212.0-alpha4 tag. Perhaps we should switch to that?

Anyway, I applied to master as is.

Regards,
Arnout

Quoted 38 lines
package/qt5/qt5webkit/qt5webkit.mk +9 -13
+QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz
  QT5WEBKIT_DEPENDENCIES = \
-	host-bison host-flex host-gperf host-python host-ruby \
-	leveldb sqlite
+	host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \
+	gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \
+	qt5sensors qt5webchannel sqlite webp woff2
  QT5WEBKIT_INSTALL_STAGING = YES
 
  QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
@@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
  QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
 
  ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
-QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
+QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender
  endif
 
  ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
  QT5WEBKIT_DEPENDENCIES += qt5declarative
  endif
 
-# QtWebkit's build system uses python, but only supports python2. We work
-# around this by forcing python2 early in the PATH, via a python->python2
-# symlink.
-QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
-QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
-define QT5WEBKIT_PYTHON2_SYMLINK
-	mkdir -p $(@D)/host-bin
-	ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python
-endef
-QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
+QT5WEBKIT_CONF_OPTS += \
+	-DPORT=Qt \
+	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \
+	-DUSE_LIBHYPHEN=OFF
 

package/qt5/qt5webkit/qt5webkit.mk QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause · line 36

Quoted 10 lines
package/qt5/qt5webkit/qt5webkit.mk +1 -9
-QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb
-
-define QT5WEBKIT_INSTALL_TARGET_EXTRAS
-	cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/
-endef
-
-QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS
-
-$(eval $(qmake-package))
+$(eval $(cmake-package))

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
Quoted 8 lines · Arnout Vandecappelle
Quoted 2 lines · James Hilliard

Switch to latest release in new active upstream:
https://github.com/qtwebkit/qtwebkit

Perhaps you can push the remaining patch to upstream then?

Oh, it's already upstream, switched to that version here:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

Quoted 30 lines
Quoted 12 lines

Migrate python2 build to python3.

Drop patches that are upstream/no longer needed.

Adapt/add patches to fix build issues.

Rework build system to use cmake instead of qmake(which does not currently support cross compilation).

[snip]

package/qt5/qt5webkit/qt5webkit.mk line 8

Quoted 13 lines
package/qt5/qt5webkit/qt5webkit.mk +2 -3
index dd99661be0..3af1918a46 100644
@@ -4,12 +4,13 @@
  #
  ################################################################################
 
-QT5WEBKIT_VERSION = 5.9.1
-QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
-QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
+QT5WEBKIT_VERSION = 5.212.0-alpha4
+QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION)

Upstream README says:

Quoted 5 lines

Use the following repository if you need to get latest snapshots of QtWebKit code:

http://code.qt.io/cgit/qt/qtwebkit.git/

This repo aslo has a 5.212.0-alpha4 tag. Perhaps we should switch to that?

That repo has no recent activity and appears abandoned, the new upstream is a fork
of that, also I didn't see a release tarball from qt organization(which seems to no longer
maintain qtwebkit at all).

Quoted 43 lines

Anyway, I applied to master as is.

Regards,
Arnout

Quoted 37 lines
package/qt5/qt5webkit/qt5webkit.mk +9 -13
+QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz
  QT5WEBKIT_DEPENDENCIES = \
-     host-bison host-flex host-gperf host-python host-ruby \
-     leveldb sqlite
+     host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \
+     gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \
+     qt5sensors qt5webchannel sqlite webp woff2
  QT5WEBKIT_INSTALL_STAGING = YES
 
  QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
@@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
  QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
 
  ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
-QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
+QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender
  endif
 
  ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
  QT5WEBKIT_DEPENDENCIES += qt5declarative
  endif
 
-# QtWebkit's build system uses python, but only supports python2. We work
-# around this by forcing python2 early in the PATH, via a python->python2
-# symlink.
-QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
-QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
-define QT5WEBKIT_PYTHON2_SYMLINK
-     mkdir -p $(@D)/host-bin
-     ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python
-endef
-QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
+QT5WEBKIT_CONF_OPTS += \
+     -DPORT=Qt \
+     -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \
+     -DUSE_LIBHYPHEN=OFF
 
Quoted 11 lines

package/qt5/qt5webkit/qt5webkit.mk QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause · line 36

Quoted 11 lines
package/qt5/qt5webkit/qt5webkit.mk +1 -9
-QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb
-
-define QT5WEBKIT_INSTALL_TARGET_EXTRAS
-     cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/
-endef
-
-QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS
-
-$(eval $(qmake-package))
+$(eval $(cmake-package))

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot