* [Buildroot] [PATCH 1/1] package/wpewebkit: Fix build with icu 65.1
@ 2020-01-21 1:55 James Hilliard
2020-01-21 8:41 ` Adrian Perez de Castro
2020-01-21 20:07 ` Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: James Hilliard @ 2020-01-21 1:55 UTC (permalink / raw)
To: buildroot
Add patch to fix build issue introduced in buildroot commit
e2a2fab11baf7cdc7e74d4f65ec73c4c79668007 which bumped ICU to
version 65.1.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
.../0002-Fix-build-with-icu-65.1.patch | 76 +++++++++++++++++++
1 file changed, 76 insertions(+)
create mode 100644 package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
diff --git a/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch b/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
new file mode 100644
index 0000000000..7d4d23d472
--- /dev/null
+++ b/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
@@ -0,0 +1,76 @@
+From 730b80e691a4b9dd0e9727cfcd9806dfa542397b Mon Sep 17 00:00:00 2001
+From: "commit-queue at webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Fri, 4 Oct 2019 21:51:37 +0000
+Subject: [PATCH] Fix build with icu 65.1
+ https://bugs.webkit.org/show_bug.cgi?id=202600
+
+Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
+Reviewed by Konstantin Tokarev.
+
+Source/WebCore:
+
+* dom/Document.cpp:
+(WebCore::isValidNameNonASCII):
+(WebCore::Document::parseQualifiedName):
+
+Source/WTF:
+
+* wtf/URLHelpers.cpp:
+(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+[james.hilliard1 at gmail.com: backport from upstream webkit commit
+730b80e691a4b9dd0e9727cfcd9806dfa542397b]
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+---
+ Source/WTF/ChangeLog | 10 ++++++++++
+ Source/WTF/wtf/URLHelpers.cpp | 2 +-
+ Source/WebCore/ChangeLog | 11 +++++++++++
+ Source/WebCore/dom/Document.cpp | 6 +++---
+ 4 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
+index 18e7f13cd61..c584f1a0cb7 100644
+--- a/Source/WTF/wtf/URLHelpers.cpp
++++ b/Source/WTF/wtf/URLHelpers.cpp
+@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
+ Optional<UChar32> previousCodePoint;
+ while (i < length) {
+ UChar32 c;
+- U16_NEXT(buffer, i, length, c)
++ U16_NEXT(buffer, i, length, c);
+ UErrorCode error = U_ZERO_ERROR;
+ UScriptCode script = uscript_getScript(c, &error);
+ if (error != U_ZERO_ERROR) {
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 2443e24c9bc..1fbb3a71600 100644
+--- a/Source/WebCore/dom/Document.cpp
++++ b/Source/WebCore/dom/Document.cpp
+@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
+ unsigned i = 0;
+
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNameStart(c))
+ return false;
+
+ while (i < length) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNamePart(c))
+ return false;
+ }
+@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
+
+ for (unsigned i = 0; i < length; ) {
+ UChar32 c;
+- U16_NEXT(qualifiedName, i, length, c)
++ U16_NEXT(qualifiedName, i, length, c);
+ if (c == ':') {
+ if (sawColon)
+ return Exception { InvalidCharacterError };
+--
+2.20.1
+
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/wpewebkit: Fix build with icu 65.1
2020-01-21 1:55 [Buildroot] [PATCH 1/1] package/wpewebkit: Fix build with icu 65.1 James Hilliard
@ 2020-01-21 8:41 ` Adrian Perez de Castro
2020-01-21 16:46 ` Adrian Perez de Castro
2020-01-21 20:07 ` Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Adrian Perez de Castro @ 2020-01-21 8:41 UTC (permalink / raw)
To: buildroot
On Mon, 20 Jan 2020 18:55:43 -0700, James Hilliard <james.hilliard1@gmail.com> wrote:
> Add patch to fix build issue introduced in buildroot commit
> e2a2fab11baf7cdc7e74d4f65ec73c4c79668007 which bumped ICU to
> version 65.1.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Acked-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> .../0002-Fix-build-with-icu-65.1.patch | 76 +++++++++++++++++++
> 1 file changed, 76 insertions(+)
> create mode 100644 package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
>
> diff --git a/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch b/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
> new file mode 100644
> index 0000000000..7d4d23d472
> --- /dev/null
> +++ b/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
> @@ -0,0 +1,76 @@
> +From 730b80e691a4b9dd0e9727cfcd9806dfa542397b Mon Sep 17 00:00:00 2001
> +From: "commit-queue at webkit.org"
> + <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
> +Date: Fri, 4 Oct 2019 21:51:37 +0000
> +Subject: [PATCH] Fix build with icu 65.1
> + https://bugs.webkit.org/show_bug.cgi?id=202600
> +
> +Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
> +Reviewed by Konstantin Tokarev.
> +
> +Source/WebCore:
> +
> +* dom/Document.cpp:
> +(WebCore::isValidNameNonASCII):
> +(WebCore::Document::parseQualifiedName):
> +
> +Source/WTF:
> +
> +* wtf/URLHelpers.cpp:
> +(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
> +
> +git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
> +[james.hilliard1 at gmail.com: backport from upstream webkit commit
> +730b80e691a4b9dd0e9727cfcd9806dfa542397b]
> +Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> +---
> + Source/WTF/ChangeLog | 10 ++++++++++
> + Source/WTF/wtf/URLHelpers.cpp | 2 +-
> + Source/WebCore/ChangeLog | 11 +++++++++++
> + Source/WebCore/dom/Document.cpp | 6 +++---
> + 4 files changed, 25 insertions(+), 4 deletions(-)
> +
> +diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
> +index 18e7f13cd61..c584f1a0cb7 100644
> +--- a/Source/WTF/wtf/URLHelpers.cpp
> ++++ b/Source/WTF/wtf/URLHelpers.cpp
> +@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
> + Optional<UChar32> previousCodePoint;
> + while (i < length) {
> + UChar32 c;
> +- U16_NEXT(buffer, i, length, c)
> ++ U16_NEXT(buffer, i, length, c);
> + UErrorCode error = U_ZERO_ERROR;
> + UScriptCode script = uscript_getScript(c, &error);
> + if (error != U_ZERO_ERROR) {
> +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
> +index 2443e24c9bc..1fbb3a71600 100644
> +--- a/Source/WebCore/dom/Document.cpp
> ++++ b/Source/WebCore/dom/Document.cpp
> +@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
> + unsigned i = 0;
> +
> + UChar32 c;
> +- U16_NEXT(characters, i, length, c)
> ++ U16_NEXT(characters, i, length, c);
> + if (!isValidNameStart(c))
> + return false;
> +
> + while (i < length) {
> +- U16_NEXT(characters, i, length, c)
> ++ U16_NEXT(characters, i, length, c);
> + if (!isValidNamePart(c))
> + return false;
> + }
> +@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
> +
> + for (unsigned i = 0; i < length; ) {
> + UChar32 c;
> +- U16_NEXT(qualifiedName, i, length, c)
> ++ U16_NEXT(qualifiedName, i, length, c);
> + if (c == ':') {
> + if (sawColon)
> + return Exception { InvalidCharacterError };
> +--
> +2.20.1
> +
> --
> 2.20.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200121/3e68141a/attachment.asc>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/wpewebkit: Fix build with icu 65.1
2020-01-21 8:41 ` Adrian Perez de Castro
@ 2020-01-21 16:46 ` Adrian Perez de Castro
0 siblings, 0 replies; 4+ messages in thread
From: Adrian Perez de Castro @ 2020-01-21 16:46 UTC (permalink / raw)
To: buildroot
On Tue, 21 Jan 2020 10:41:52 +0200, Adrian Perez de Castro <aperez@igalia.com> wrote:
> On Mon, 20 Jan 2020 18:55:43 -0700, James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > Add patch to fix build issue introduced in buildroot commit
> > e2a2fab11baf7cdc7e74d4f65ec73c4c79668007 which bumped ICU to
> > version 65.1.
> >
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
>
> Acked-by: Adrian Perez de Castro <aperez@igalia.com>
Of course, we also need to apply the same patch to the WebKitGTK package.
I have submitted the patch, here:
https://patchwork.ozlabs.org/patch/1226666/
Cheers,
?Adri?n
> > ---
> > .../0002-Fix-build-with-icu-65.1.patch | 76 +++++++++++++++++++
> > 1 file changed, 76 insertions(+)
> > create mode 100644 package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
> >
> > diff --git a/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch b/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
> > new file mode 100644
> > index 0000000000..7d4d23d472
> > --- /dev/null
> > +++ b/package/wpewebkit/0002-Fix-build-with-icu-65.1.patch
> > @@ -0,0 +1,76 @@
> > +From 730b80e691a4b9dd0e9727cfcd9806dfa542397b Mon Sep 17 00:00:00 2001
> > +From: "commit-queue at webkit.org"
> > + <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
> > +Date: Fri, 4 Oct 2019 21:51:37 +0000
> > +Subject: [PATCH] Fix build with icu 65.1
> > + https://bugs.webkit.org/show_bug.cgi?id=202600
> > +
> > +Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
> > +Reviewed by Konstantin Tokarev.
> > +
> > +Source/WebCore:
> > +
> > +* dom/Document.cpp:
> > +(WebCore::isValidNameNonASCII):
> > +(WebCore::Document::parseQualifiedName):
> > +
> > +Source/WTF:
> > +
> > +* wtf/URLHelpers.cpp:
> > +(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
> > +
> > +git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
> > +[james.hilliard1 at gmail.com: backport from upstream webkit commit
> > +730b80e691a4b9dd0e9727cfcd9806dfa542397b]
> > +Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > +---
> > + Source/WTF/ChangeLog | 10 ++++++++++
> > + Source/WTF/wtf/URLHelpers.cpp | 2 +-
> > + Source/WebCore/ChangeLog | 11 +++++++++++
> > + Source/WebCore/dom/Document.cpp | 6 +++---
> > + 4 files changed, 25 insertions(+), 4 deletions(-)
> > +
> > +diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
> > +index 18e7f13cd61..c584f1a0cb7 100644
> > +--- a/Source/WTF/wtf/URLHelpers.cpp
> > ++++ b/Source/WTF/wtf/URLHelpers.cpp
> > +@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
> > + Optional<UChar32> previousCodePoint;
> > + while (i < length) {
> > + UChar32 c;
> > +- U16_NEXT(buffer, i, length, c)
> > ++ U16_NEXT(buffer, i, length, c);
> > + UErrorCode error = U_ZERO_ERROR;
> > + UScriptCode script = uscript_getScript(c, &error);
> > + if (error != U_ZERO_ERROR) {
> > +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
> > +index 2443e24c9bc..1fbb3a71600 100644
> > +--- a/Source/WebCore/dom/Document.cpp
> > ++++ b/Source/WebCore/dom/Document.cpp
> > +@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
> > + unsigned i = 0;
> > +
> > + UChar32 c;
> > +- U16_NEXT(characters, i, length, c)
> > ++ U16_NEXT(characters, i, length, c);
> > + if (!isValidNameStart(c))
> > + return false;
> > +
> > + while (i < length) {
> > +- U16_NEXT(characters, i, length, c)
> > ++ U16_NEXT(characters, i, length, c);
> > + if (!isValidNamePart(c))
> > + return false;
> > + }
> > +@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
> > +
> > + for (unsigned i = 0; i < length; ) {
> > + UChar32 c;
> > +- U16_NEXT(qualifiedName, i, length, c)
> > ++ U16_NEXT(qualifiedName, i, length, c);
> > + if (c == ':') {
> > + if (sawColon)
> > + return Exception { InvalidCharacterError };
> > +--
> > +2.20.1
> > +
> > --
> > 2.20.1
> >
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200121/e06b35c4/attachment.asc>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/wpewebkit: Fix build with icu 65.1
2020-01-21 1:55 [Buildroot] [PATCH 1/1] package/wpewebkit: Fix build with icu 65.1 James Hilliard
2020-01-21 8:41 ` Adrian Perez de Castro
@ 2020-01-21 20:07 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2020-01-21 20:07 UTC (permalink / raw)
To: buildroot
>>>>> "James" == James Hilliard <james.hilliard1@gmail.com> writes:
> Add patch to fix build issue introduced in buildroot commit
> e2a2fab11baf7cdc7e74d4f65ec73c4c79668007 which bumped ICU to
> version 65.1.
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-21 20:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-21 1:55 [Buildroot] [PATCH 1/1] package/wpewebkit: Fix build with icu 65.1 James Hilliard
2020-01-21 8:41 ` Adrian Perez de Castro
2020-01-21 16:46 ` Adrian Perez de Castro
2020-01-21 20:07 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.