a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001
|
||
From: Peter Seiderer <ps.report@gmx.net>
|
||
Date: Sun, 2 Feb 2020 10:51:00 +0100
|
||
Subject: [PATCH] Fix ICU related compile failures.
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
The ICU macro U16_NEXT() needs a trailing semicolon.
|
||
|
||
Fixes:
|
||
|
||
platform/graphics/SegmentedFontData.cpp:65:9: error: expected ‘;’ before ‘if’
|
||
dom/Document.cpp:3850:5: error: expected ‘;’ before ‘if’
|
||
dom/Document.cpp:3855:9: error: expected ‘;’ before ‘if’
|
||
dom/Document.cpp:3918:9: error: expected ‘;’ before ‘if’
|
||
|
||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||
---
|
||
Source/WebCore/dom/Document.cpp | 6 +++---
|
||
Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +-
|
||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
||
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
|
||
index af63b141..26f7312b 100644
|
||
--- a/Source/WebCore/dom/Document.cpp
|
||
+++ b/Source/WebCore/dom/Document.cpp
|
||
@@ -3846,12 +3846,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;
|
||
}
|
||
@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
|
||
const UChar* s = qualifiedName.characters();
|
||
for (unsigned i = 0; i < length;) {
|
||
UChar32 c;
|
||
- U16_NEXT(s, i, length, c)
|
||
+ U16_NEXT(s, i, length, c);
|
||
if (c == ':') {
|
||
if (sawColon) {
|
||
ec = NAMESPACE_ERR;
|
||
diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
|
||
index efb20a8c..99b3e86c 100644
|
||
--- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp
|
||
+++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
|
||
@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length)
|
||
{
|
||
UChar32 c;
|
||
for (int i = 0; i < length; ) {
|
||
- U16_NEXT(characters, i, length, c)
|
||
+ U16_NEXT(characters, i, length, c);
|
||
if (!containsCharacter(c))
|
||
return false;
|
||
}
|
||
--
|
||
2.25.0
|
||
|