qt5-webkit: rebuild for icu-69.1
This commit is contained in:
Duncaen
parent
633e3eaf47
commit
244e54a747
3 changed files with 197 additions and 1 deletions
26
srcpkgs/qt5-webkit/patches/glib-2.68.patch
Normal file
26
srcpkgs/qt5-webkit/patches/glib-2.68.patch
Normal file
|
|
@ -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 };
|
||||||
170
srcpkgs/qt5-webkit/patches/icu-68.patch
Normal file
170
srcpkgs/qt5-webkit/patches/icu-68.patch
Normal file
|
|
@ -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;
|
||||||
|
^
|
||||||
|
|
||||||
|
--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC
|
||||||
|
+++ b/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)
|
||||||
|
--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC
|
||||||
|
+++ b/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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC
|
||||||
|
+++ b/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)
|
||||||
|
--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC
|
||||||
|
+++ b/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)
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'qt5-webkit'
|
# Template file for 'qt5-webkit'
|
||||||
pkgname=qt5-webkit
|
pkgname=qt5-webkit
|
||||||
version=5.212.0
|
version=5.212.0
|
||||||
revision=11
|
revision=12
|
||||||
_snap=1586819898
|
_snap=1586819898
|
||||||
_v=${version%.*}
|
_v=${version%.*}
|
||||||
wrksrc="qtwebkit-opensource-src-${_v}"
|
wrksrc="qtwebkit-opensource-src-${_v}"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue