-
-
Notifications
You must be signed in to change notification settings - Fork 590
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
268 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 | ||
| From: Fabian Vogt <fvogt@suse.de> | ||
| 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. | ||
| --- | ||
| 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 }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 | ||
|
|
||
| In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: | ||
| Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' | ||
| ucnv_setFallback(m_converterICU, TRUE); | ||
| ^ | ||
| In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: | ||
| In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: | ||
| Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' | ||
| isAccessible = TRUE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' | ||
| isAccessible = FALSE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' | ||
| isAccessible = TRUE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' | ||
| isAccessible = FALSE; | ||
| ^ | ||
| In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: | ||
| Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' | ||
| return TRUE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' | ||
| return FALSE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' | ||
| return TRUE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' | ||
| return FALSE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' | ||
| return TRUE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' | ||
| return FALSE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' | ||
| return TRUE; | ||
| ^ | ||
| In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: | ||
| Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' | ||
| return FALSE; | ||
| ^ | ||
| Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' | ||
| return TRUE; | ||
| ^ | ||
|
|
||
| --- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC | ||
| +++ 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) | ||
| --- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC | ||
| +++ Source/WebCore/platform/text/icu/UTextProvider.h | ||
| @@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text | ||
| // 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 | ||
| // 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; | ||
| } | ||
| } | ||
| --- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC | ||
| +++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp | ||
| @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i | ||
| 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 i | ||
|
|
||
| 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(UTe | ||
| 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 | ||
| 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) | ||
| --- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC | ||
| +++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp | ||
| @@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng | ||
| 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, | ||
| 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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h | ||
| index 7aefa1ba..562fd449 100644 | ||
| --- a/Source/WTF/wtf/Platform.h | ||
| +++ b/Source/WTF/wtf/Platform.h | ||
| @@ -566,6 +566,11 @@ | ||
|
|
||
| #endif /* PLATFORM(MAC) */ | ||
|
|
||
| +/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */ | ||
| +/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */ | ||
| +#define U_SHOW_CPLUSPLUS_API 0 | ||
| +#define U_SHOW_CPLUSPLUS_HEADER_API 0 | ||
| + | ||
| #if PLATFORM(IOS) | ||
|
|
||
| #define HAVE_NETWORK_EXTENSION 1 |
46 changes: 46 additions & 0 deletions
46
packages/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| From c7d19a492d97f9282a546831beb918e03315f6ef Mon Sep 17 00:00:00 2001 | ||
| From: Adrian Perez de Castro <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. | ||
|
|
||
|
|
||
| Canonical link: https://commits.webkit.org/219400@main | ||
| git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc | ||
| --- | ||
| Source/JavaScriptCore/ChangeLog | 13 +++++++++++++ | ||
| Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- | ||
| 2 files changed, 16 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb | ||
| index 791c81a9868d..f14c873e2dbd 100644 | ||
| --- a/Source/JavaScriptCore/offlineasm/parser.rb | ||
| +++ b/Source/JavaScriptCore/offlineasm/parser.rb | ||
| @@ -628,9 +628,7 @@ def parseSequence(final, comment) | ||
| 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. | ||
| @@ -644,6 +642,8 @@ def parseSequence(final, comment) | ||
| 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 |