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

Fix build with newer icu4c.

Browse Source
This commit is contained in:
ajacoutot 2019-10-05 09:46:45 +00:00
parent 13e53def60
commit 19bdbaca66
3 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/webkitgtk4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.110 2019/09/24 11:20:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.111 2019/10/05 09:46:45 ajacoutot Exp $
# patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
# patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
@ -19,6 +19,7 @@ EXTRACT_SUFX = .tar.xz
API = 4.0
SUBST_VARS = API
DPB_PROPERTIES = parallel
REVISION = 0
SHARED_LIBS += javascriptcoregtk-${API} 3.1 # 18.13.3
SHARED_LIBS += webkit2gtk-${API} 3.1 # 37.37.2

18
www/webkitgtk4/patches/patch-Source_WTF_wtf_URLHelpers_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-Source_WTF_wtf_URLHelpers_cpp,v 1.1 2019/10/05 09:46:45 ajacoutot Exp $
From: "commit-queue@webkit.org"
Date: Fri, 4 Oct 2019 21:51:37 +0000
Subject: [PATCH] Fix build with icu 65.1 https://bugs.webkit.org/show_bug.cgi?id=202600
Index: Source/WTF/wtf/URLHelpers.cpp
--- Source/WTF/wtf/URLHelpers.cpp.orig
+++ Source/WTF/wtf/URLHelpers.cpp
@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UC
Optional<UChar32> previousCodePoint;
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) {

33
www/webkitgtk4/patches/patch-Source_WebCore_dom_Document_cpp Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-Source_WebCore_dom_Document_cpp,v 1.1 2019/10/05 09:46:45 ajacoutot Exp $
From: "commit-queue@webkit.org"
Date: Fri, 4 Oct 2019 21:51:37 +0000
Subject: [PATCH] Fix build with icu 65.1 https://bugs.webkit.org/show_bug.cgi?id=202600
Index: Source/WebCore/dom/Document.cpp
--- Source/WebCore/dom/Document.cpp.orig
+++ Source/WebCore/dom/Document.cpp
@@ -4944,12 +4944,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;
}
@@ -5009,7 +5009,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Documen
for (unsigned i = 0; i < length; ) {
UChar32 c;
- U16_NEXT(qualifiedName, i, length, c)
+ U16_NEXT(qualifiedName, i, length, c);
if (c == ':') {
if (sawColon)
return Exception { InvalidCharacterError };