* [Buildroot] [PATCH 0/2] package/qt5/qt5webkit: backport upstream patches to fix build
@ 2024-03-13 22:46 Alexis Lothoré via buildroot
2024-03-13 22:46 ` [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error Alexis Lothoré via buildroot
2024-03-13 22:46 ` [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2 Alexis Lothoré via buildroot
0 siblings, 2 replies; 7+ messages in thread
From: Alexis Lothoré via buildroot @ 2024-03-13 22:46 UTC (permalink / raw)
To: buildroot; +Cc: Giulio Benetti, Julien Corjon, Thomas Petazzoni
Hello,
while updating a local buildroot tree to 2024.02, I observed some build
failures around qt5webkit, which are reproducible with upstream tree with
the following minimal defconfig, both on 2024.02 tag and master:
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5WEBKIT=y
There are two different issues breaking the build. Both are already fixed
in upstream Webkit repository, but the current qt5webkit version tracked in
buildroot does not have the corresponding fixes. This series brings the two
corresponding patches from upstream Webkit to fix the build.
Alexis Lothoré (2):
package/qt5/qt5webkit: fix JavaScriptCore parser error
package/qt5/qt5webkit: fix WebCore compatibility issue with updated
libxml2
...ngs-with-newer-Ruby-versions-https-b.patch | 48 +++++++++++++++
...-libxml2-version-2.12.0-due-to-API-c.patch | 61 +++++++++++++++++++
2 files changed, 109 insertions(+)
create mode 100644 package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch
create mode 100644 package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch
--
2.43.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error
2024-03-13 22:46 [Buildroot] [PATCH 0/2] package/qt5/qt5webkit: backport upstream patches to fix build Alexis Lothoré via buildroot
@ 2024-03-13 22:46 ` Alexis Lothoré via buildroot
2024-07-12 13:45 ` Thomas Petazzoni via buildroot
2024-07-31 16:35 ` Peter Korsgaard
2024-03-13 22:46 ` [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2 Alexis Lothoré via buildroot
1 sibling, 2 replies; 7+ messages in thread
From: Alexis Lothoré via buildroot @ 2024-03-13 22:46 UTC (permalink / raw)
To: buildroot; +Cc: Giulio Benetti, Julien Corjon, Thomas Petazzoni
From: Alexis Lothoré <alexis.lothore@bootlin.com>
qt5webkit build currently fails with the following error:
[...] parser.rb:587:in `block in parseSequence': undefined method `=~' for an instance of Annotation (NoMethodError)
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:654:in `block in parseSequence'
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:780:in `block in parseSequence'
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:625:in `block in parseSequence'
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:68:in `<main>'
This issue is due to =~ being marked as deprecated since a few Ruby
versions, and finally removed in 3.2.0 [1]. This now breaks the build since
buildroot has moved to Ruby v3.3.0.
The corresponding fix has already been issued in upstream Webkit project
[2], but qt5webkit version tracked in buildroot does not have the
corresponding webkit version pulled. Fix this build error by bringing the upstream
patch. The patch is slightly modified (exclude part about Changelog file,
which is absent from qt5webkit)
[1] https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/
[2] https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
...ngs-with-newer-Ruby-versions-https-b.patch | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch
diff --git a/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch b/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch
new file mode 100644
index 000000000000..c8e339c5f80b
--- /dev/null
+++ b/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch
@@ -0,0 +1,48 @@
+From 47e03d4af292805bf304f09e34333b38a94c1789 Mon Sep 17 00:00:00 2001
+From: "aperez@igalia.com" <aperez@igalia.com>
+Date: Wed, 15 Jan 2020 22:15:38 +0000
+Subject: [PATCH] Offlineasm warnings with newer Ruby versions
+ https://bugs.webkit.org/show_bug.cgi?id=206233
+
+Reviewed by Yusuke Suzuki.
+
+Avoid a warning about using Object#=~ on Annotation instances, which
+has been deprecated in Ruby 2.7.
+
+* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator
+to Annotation instances, which do not define it.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+Upstream: https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef
+Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
+---
+ Source/JavaScriptCore/offlineasm/parser.rb | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb
+index b4451124521f..cd1cffaec6ed 100644
+--- a/Source/JavaScriptCore/offlineasm/parser.rb
++++ b/Source/JavaScriptCore/offlineasm/parser.rb
+@@ -584,9 +584,7 @@ class Parser
+ firstCodeOrigin = @tokens[@idx].codeOrigin
+ list = []
+ loop {
+- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
+- break
+- elsif @tokens[@idx].is_a? Annotation
++ if @tokens[@idx].is_a? Annotation
+ # This is the only place where we can encounter a global
+ # annotation, and hence need to be able to distinguish between
+ # them.
+@@ -600,6 +598,8 @@ class Parser
+ list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string)
+ @annotation = nil
+ @idx += 2 # Consume the newline as well.
++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
++ break
+ elsif @tokens[@idx] == "\n"
+ # ignore
+ @idx += 1
+--
+2.43.1
+
--
2.43.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2
2024-03-13 22:46 [Buildroot] [PATCH 0/2] package/qt5/qt5webkit: backport upstream patches to fix build Alexis Lothoré via buildroot
2024-03-13 22:46 ` [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error Alexis Lothoré via buildroot
@ 2024-03-13 22:46 ` Alexis Lothoré via buildroot
2024-07-12 13:45 ` Thomas Petazzoni via buildroot
2024-07-31 16:35 ` Peter Korsgaard
1 sibling, 2 replies; 7+ messages in thread
From: Alexis Lothoré via buildroot @ 2024-03-13 22:46 UTC (permalink / raw)
To: buildroot; +Cc: Giulio Benetti, Julien Corjon, Thomas Petazzoni
From: Alexis Lothoré <alexis.lothore@bootlin.com>
qt5webkit build currently breaks on the following error:
XSLStyleSheetLibxslt.cpp:148:129: error: invalid conversion from ‘void (*)(void*, xmlError*)’ {aka ‘void (*)(void*, _xmlError*)’} to ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void*, const _xmlError*)’} [-fpermissive]
148 | XMLDocumentParserScope scope(cachedResourceLoader(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console);
| ^
| |
| void (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)}
This error is due to an API update in libxml2, enforcing const on more
struct in version 2.12.0 (see [1]). Buildroot now tracks v2.12.5.
Upstream Webkit project has already issued the corresponding fix ([2]),
which updates corresponding internal prototypes depending on libxml2
version, but the qt5webkit version tracked in buildroot does not integrate
the corresponding Webkit version.
Fix this build issue by bringing the upstream patch "as is" from Webkit
[1] https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
[2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
...-libxml2-version-2.12.0-due-to-API-c.patch | 61 +++++++++++++++++++
1 file changed, 61 insertions(+)
create mode 100644 package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch
diff --git a/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch b/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch
new file mode 100644
index 000000000000..d6f379ae8ecd
--- /dev/null
+++ b/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch
@@ -0,0 +1,61 @@
+From df49bfc4c93001970c9b9266903ee7e8804fb576 Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Mon, 20 Nov 2023 07:42:30 -0800
+Subject: [PATCH] Build fails with libxml2 version 2.12.0 due to API change
+ https://bugs.webkit.org/show_bug.cgi?id=265128
+
+Reviewed by Philippe Normand.
+
+Starting with libxml2 2.12.0, the API has changed the const-ness of the
+xmlError pointers, which results in a build error due to a mismatched
+type in the parsing error callback. This papers over the difference by
+using preprocessor conditionals.
+
+* Source/WebCore/xml/XSLTProcessor.h: Use const when building against
+ libxml2 2.12.0 or newer.
+* Source/WebCore/xml/XSLTProcessorLibxslt.cpp:
+(WebCore::XSLTProcessor::parseErrorFunc): Ditto.
+
+Canonical link: https://commits.webkit.org/270977@main
+Upstream: https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
+Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
+---
+ Source/WebCore/xml/XSLTProcessor.h | 4 ++++
+ Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h
+index 21bb45b5cbe1..5cf20557918f 100644
+--- a/Source/WebCore/xml/XSLTProcessor.h
++++ b/Source/WebCore/xml/XSLTProcessor.h
+@@ -61,7 +61,11 @@ public:
+
+ void reset();
+
++#if LIBXML_VERSION >= 21200
++ static void parseErrorFunc(void* userData, const xmlError*);
++#else
+ static void parseErrorFunc(void* userData, xmlError*);
++#endif
+ static void genericErrorFunc(void* userData, const char* msg, ...);
+
+ // Only for libXSLT callbacks
+diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+index a65691087e3c..9f6b363dfc6c 100644
+--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
++++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+@@ -59,7 +59,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...)
+ // It would be nice to do something with this error message.
+ }
+
++#if LIBXML_VERSION >= 21200
++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error)
++#else
+ void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
++#endif
+ {
+ PageConsoleClient* console = static_cast<PageConsoleClient*>(userData);
+ if (!console)
+--
+2.43.1
+
--
2.43.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error
2024-03-13 22:46 ` [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error Alexis Lothoré via buildroot
@ 2024-07-12 13:45 ` Thomas Petazzoni via buildroot
2024-07-31 16:35 ` Peter Korsgaard
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 13:45 UTC (permalink / raw)
To: Alexis Lothoré via buildroot
Cc: Giulio Benetti, Alexis Lothoré, Julien Corjon
On Wed, 13 Mar 2024 23:46:09 +0100
Alexis Lothoré via buildroot <buildroot@buildroot.org> wrote:
> From: Alexis Lothoré <alexis.lothore@bootlin.com>
>
> qt5webkit build currently fails with the following error:
>
> [...] parser.rb:587:in `block in parseSequence': undefined method `=~' for an instance of Annotation (NoMethodError)
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:654:in `block in parseSequence'
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:780:in `block in parseSequence'
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:625:in `block in parseSequence'
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:68:in `<main>'
>
> This issue is due to =~ being marked as deprecated since a few Ruby
> versions, and finally removed in 3.2.0 [1]. This now breaks the build since
> buildroot has moved to Ruby v3.3.0.
> The corresponding fix has already been issued in upstream Webkit project
> [2], but qt5webkit version tracked in buildroot does not have the
> corresponding webkit version pulled. Fix this build error by bringing the upstream
> patch. The patch is slightly modified (exclude part about Changelog file,
> which is absent from qt5webkit)
>
> [1] https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/
> [2] https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef
>
> Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
> ---
> ...ngs-with-newer-Ruby-versions-https-b.patch | 48 +++++++++++++++++++
> 1 file changed, 48 insertions(+)
> create mode 100644 package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch
Applied to master after adding a reference to the autobuilder issue
being fixed by this commit. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2
2024-03-13 22:46 ` [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2 Alexis Lothoré via buildroot
@ 2024-07-12 13:45 ` Thomas Petazzoni via buildroot
2024-07-31 16:35 ` Peter Korsgaard
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 13:45 UTC (permalink / raw)
To: Alexis Lothoré via buildroot
Cc: Giulio Benetti, Alexis Lothoré, Julien Corjon
On Wed, 13 Mar 2024 23:46:10 +0100
Alexis Lothoré via buildroot <buildroot@buildroot.org> wrote:
> From: Alexis Lothoré <alexis.lothore@bootlin.com>
>
> qt5webkit build currently breaks on the following error:
>
> XSLStyleSheetLibxslt.cpp:148:129: error: invalid conversion from ‘void (*)(void*, xmlError*)’ {aka ‘void (*)(void*, _xmlError*)’} to ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void*, const _xmlError*)’} [-fpermissive]
> 148 | XMLDocumentParserScope scope(cachedResourceLoader(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console);
> | ^
> | |
> | void (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)}
>
> This error is due to an API update in libxml2, enforcing const on more
> struct in version 2.12.0 (see [1]). Buildroot now tracks v2.12.5.
> Upstream Webkit project has already issued the corresponding fix ([2]),
> which updates corresponding internal prototypes depending on libxml2
> version, but the qt5webkit version tracked in buildroot does not integrate
> the corresponding Webkit version.
>
> Fix this build issue by bringing the upstream patch "as is" from Webkit
>
> [1] https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
> [2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
>
> Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
> ---
> ...-libxml2-version-2.12.0-due-to-API-c.patch | 61 +++++++++++++++++++
> 1 file changed, 61 insertions(+)
> create mode 100644 package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch
Applied to master, thanks. I couldn't add any autobuilder reference,
because this issue was apparently "hidden" behind the issue fixed in
PATCH 1/2. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error
2024-03-13 22:46 ` [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error Alexis Lothoré via buildroot
2024-07-12 13:45 ` Thomas Petazzoni via buildroot
@ 2024-07-31 16:35 ` Peter Korsgaard
1 sibling, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2024-07-31 16:35 UTC (permalink / raw)
To: Alexis Lothoré via buildroot
Cc: Giulio Benetti, Alexis Lothoré, Thomas Petazzoni,
Julien Corjon
>>>>> "Alexis" == Alexis Lothoré via buildroot <buildroot@buildroot.org> writes:
> From: Alexis Lothoré <alexis.lothore@bootlin.com>
> qt5webkit build currently fails with the following error:
> [...] parser.rb:587:in `block in parseSequence': undefined method `=~' for an instance of Annotation (NoMethodError)
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:654:in `block in parseSequence'
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:780:in `block in parseSequence'
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:625:in `block in parseSequence'
> from <internal:kernel>:187:in `loop'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
> from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:68:in `<main>'
> This issue is due to =~ being marked as deprecated since a few Ruby
> versions, and finally removed in 3.2.0 [1]. This now breaks the build since
> buildroot has moved to Ruby v3.3.0.
> The corresponding fix has already been issued in upstream Webkit project
> [2], but qt5webkit version tracked in buildroot does not have the
> corresponding webkit version pulled. Fix this build error by bringing the upstream
> patch. The patch is slightly modified (exclude part about Changelog file,
> which is absent from qt5webkit)
> [1] https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/
> [2] https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef
> Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Committed to 2024.02.x and 2024.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2
2024-03-13 22:46 ` [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2 Alexis Lothoré via buildroot
2024-07-12 13:45 ` Thomas Petazzoni via buildroot
@ 2024-07-31 16:35 ` Peter Korsgaard
1 sibling, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2024-07-31 16:35 UTC (permalink / raw)
To: Alexis Lothoré via buildroot
Cc: Giulio Benetti, Alexis Lothoré, Thomas Petazzoni,
Julien Corjon
>>>>> "Alexis" == Alexis Lothoré via buildroot <buildroot@buildroot.org> writes:
> From: Alexis Lothoré <alexis.lothore@bootlin.com>
> qt5webkit build currently breaks on the following error:
> XSLStyleSheetLibxslt.cpp:148:129: error: invalid conversion from ‘void
> (*)(void*, xmlError*)’ {aka ‘void (*)(void*, _xmlError*)’} to
> ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void*, const _xmlError*)’}
> [-fpermissive]
> 148 | XMLDocumentParserScope scope(cachedResourceLoader(),
> XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc,
> console);
> | ^
> | |
> | void
> | (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)}
> This error is due to an API update in libxml2, enforcing const on more
> struct in version 2.12.0 (see [1]). Buildroot now tracks v2.12.5.
> Upstream Webkit project has already issued the corresponding fix ([2]),
> which updates corresponding internal prototypes depending on libxml2
> version, but the qt5webkit version tracked in buildroot does not integrate
> the corresponding Webkit version.
> Fix this build issue by bringing the upstream patch "as is" from Webkit
> [1] https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
> [2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
> Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Committed to 2024.02.x and 2024.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-07-31 16:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-13 22:46 [Buildroot] [PATCH 0/2] package/qt5/qt5webkit: backport upstream patches to fix build Alexis Lothoré via buildroot
2024-03-13 22:46 ` [Buildroot] [PATCH 1/2] package/qt5/qt5webkit: fix JavaScriptCore parser error Alexis Lothoré via buildroot
2024-07-12 13:45 ` Thomas Petazzoni via buildroot
2024-07-31 16:35 ` Peter Korsgaard
2024-03-13 22:46 ` [Buildroot] [PATCH 2/2] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2 Alexis Lothoré via buildroot
2024-07-12 13:45 ` Thomas Petazzoni via buildroot
2024-07-31 16:35 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox