cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with icu4c >= 65

Browse Source
This commit is contained in:
ajacoutot 2019-10-05 09:51:36 +00:00
parent 19bdbaca66
commit 3d9d3f5e75
4 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/qt5/qtwebkit/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.14 2019/06/24 20:56:46 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2019/10/05 09:51:36 ajacoutot Exp $
QT5NAME = QtWebkit
REVISION = 8
REVISION = 9
COMMENT = old Webkit integration framework for Qt
USE_WXNEEDED = Yes
DPB_PROPERTIES = parallel

31
x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-Source_WebCore_dom_Document_cpp,v 1.1 2019/10/05 09:51:36 ajacoutot Exp $
Fix build with icu4c >=65
Index: Source/WebCore/dom/Document.cpp
--- Source/WebCore/dom/Document.cpp.orig
+++ Source/WebCore/dom/Document.cpp
@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* character
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& qualif
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;

16
x11/qt5/qtwebkit/patches/patch-Source_WebCore_platform_graphics_SegmentedFontData_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_SegmentedFontData_cpp,v 1.1 2019/10/05 09:51:36 ajacoutot Exp $
Fix build with icu4c >=65
Index: Source/WebCore/platform/graphics/SegmentedFontData.cpp
--- Source/WebCore/platform/graphics/SegmentedFontData.cpp.orig
+++ Source/WebCore/platform/graphics/SegmentedFontData.cpp
@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar
{
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;
}

25
x11/qt5/qtwebkit/patches/patch-Source_WebCore_platform_mac_WebCoreNSURLExtras_mm Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-Source_WebCore_platform_mac_WebCoreNSURLExtras_mm,v 1.1 2019/10/05 09:51:36 ajacoutot Exp $
Fix build with icu4c >=65
Index: Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
--- Source/WebCore/platform/mac/WebCoreNSURLExtras.mm.orig
+++ Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
@@ -175,7 +175,7 @@ static BOOL allCharactersInIDNScriptWhiteList(const UC
int32_t i = 0;
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) {
@@ -746,7 +746,7 @@ static CFStringRef createStringWithEscapedUnsafeCharac
CFIndex i = 0;
while (i < length) {
UChar32 c;
- U16_NEXT(sourceBuffer, i, length, c)
+ U16_NEXT(sourceBuffer, i, length, c);
if (isLookalikeCharacter(c)) {
uint8_t utf8Buffer[4];