Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: James Hilliard <james.hilliard1@gmail.com>
To: buildroot@buildroot.org
Cc: "James Hilliard" <james.hilliard1@gmail.com>,
	"Peter Seiderer" <ps.report@gmx.net>,
	"Julien Corjon" <corjon.j@ecagroup.com>,
	"Gaël Portay" <gael.portay@collabora.com>
Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: use backported ICU patch from upstream
Date: Tue,  4 Jan 2022 13:52:13 -0700	[thread overview]
Message-ID: <20220104205213.1367539-1-james.hilliard1@gmail.com> (raw)

Use backported upstream ICU fix instead of adapted downstream patch.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...ion-ICU-68.1-no-longer-exposes-FALS.patch} | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)
 rename package/qt5/qt5webkit/{0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch => 0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch} (86%)

diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch
similarity index 86%
rename from package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch
rename to package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch
index 11d0b7b248..0c3e8b3586 100644
--- a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch
+++ b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch
@@ -1,18 +1,39 @@
-From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001
-From: Henri Roosen <henri.roosen@ginzinger.com>
-Date: Thu, 18 Mar 2021 11:53:57 +0100
-Subject: [PATCH] Fix ICU related compile failures from capital bool defines
+From 736e1d804d1efa2077c4f1fe0b9084927d82e249 Mon Sep 17 00:00:00 2001
+From: "stephan.szabo@sony.com"
+ <stephan.szabo@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 3 Nov 2020 20:06:15 +0000
+Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and
+ TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
 
-See ICU-21267
+Reviewed by Don Olmstead.
 
-Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
+Source/WebCore:
+
+* platform/text/TextCodecICU.cpp: Replace use of TRUE with true
+
+Source/WebKit:
+
+* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false
+
+Source/WTF:
+
+Replace uses of FALSE and TRUE with false and true.
+
+* wtf/text/icu/UTextProvider.h:
+* wtf/text/icu/UTextProviderLatin1.cpp:
+* wtf/text/icu/UTextProviderUTF16.cpp:
+
+Change-Id: I876cf2b10b8c858c3d265113c062d159749a2f3e
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
 Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+[james.hilliard1@gmail.com: backport from upstream commit
+736e1d804d1efa2077c4f1fe0b9084927d82e249]
 ---
  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(-)
+ 7 files changed, 45 insertions(+), 14 deletions(-)
 
 diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
 index dd6ff0675bb1..e0f4bd718828 100644
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2022-01-04 20:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-04 20:52 James Hilliard [this message]
2022-01-13 20:38 ` [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: use backported ICU patch from upstream Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220104205213.1367539-1-james.hilliard1@gmail.com \
    --to=james.hilliard1@gmail.com \
    --cc=buildroot@buildroot.org \
    --cc=corjon.j@ecagroup.com \
    --cc=gael.portay@collabora.com \
    --cc=ps.report@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox