From df4a5acd72d29327a6b7fa3697f629bbd4a377a9 Mon Sep 17 00:00:00 2001 From: Tyler Young Date: Mon, 14 Sep 2020 23:15:27 -0400 Subject: [PATCH 1/4] fix missing semicolon revealed by building on alpine --- Source/WTF/wtf/URLHelpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp index 18e7f13cd..c584f1a0c 100644 --- a/Source/WTF/wtf/URLHelpers.cpp +++ b/Source/WTF/wtf/URLHelpers.cpp @@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt Optional 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) { From 00fe4f6f4747a25b2d7395c0a813d744f2bbebdf Mon Sep 17 00:00:00 2001 From: Tyler Young Date: Tue, 15 Sep 2020 01:58:10 -0400 Subject: [PATCH 2/4] Specify static ICU libraries --- Source/cmake/OptionsUltralightLinux.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmake/OptionsUltralightLinux.cmake b/Source/cmake/OptionsUltralightLinux.cmake index df17c56d2..1d3f02a43 100644 --- a/Source/cmake/OptionsUltralightLinux.cmake +++ b/Source/cmake/OptionsUltralightLinux.cmake @@ -94,9 +94,9 @@ set(WTF_LIBRARY_TYPE SHARED) link_directories("${WEBKIT_LIBRARIES_DIR}/lib") link_directories("${ULTRALIGHTCORE_DIR}/bin") -set(ICU_LIBRARIES ${WEBKIT_LIBRARIES_DIR}/lib/libicuuc.so - ${WEBKIT_LIBRARIES_DIR}/lib/libicui18n.so - ${WEBKIT_LIBRARIES_DIR}/lib/libicudata.so) +set(ICU_LIBRARIES ${WEBKIT_LIBRARIES_DIR}/lib/libicuuc.a + ${WEBKIT_LIBRARIES_DIR}/lib/libicui18n.a + ${WEBKIT_LIBRARIES_DIR}/lib/libicudata.a) set(USE_GLIB 1) set(USE_CURL 1) From e8217db0ff6cb0d8c716b0ae5e2a385587b3d657 Mon Sep 17 00:00:00 2001 From: Tyler Young Date: Tue, 15 Sep 2020 02:12:45 -0400 Subject: [PATCH 3/4] revert to using .so files, change U_ defines removes U_DISABLE_RENAMING=1 and U_STATIC_IMPLEMENTATION=1 --- Source/cmake/OptionsUltralightLinux.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/cmake/OptionsUltralightLinux.cmake b/Source/cmake/OptionsUltralightLinux.cmake index 1d3f02a43..cd2e8238e 100644 --- a/Source/cmake/OptionsUltralightLinux.cmake +++ b/Source/cmake/OptionsUltralightLinux.cmake @@ -1,11 +1,11 @@ if (${BUILD_DBG}) # Debug Config set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -DNDEBUG -fPIC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DNDEBUG -ffunction-sections -fdata-sections -fPIC -std=c++14 -Wno-trigraphs -fno-exceptions -Wno-missing-field-initializers -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wsign-compare -Wno-shorten-64-to-32 -Wno-c++11-extensions -DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0 -DU_STATIC_IMPLEMENTATION=1 -Wdeprecated-declarations -Winvalid-offsetof -fvisibility=hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wno-strict-prototypes") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DNDEBUG -ffunction-sections -fdata-sections -fPIC -std=c++14 -Wno-trigraphs -fno-exceptions -Wno-missing-field-initializers -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wsign-compare -Wno-shorten-64-to-32 -Wno-c++11-extensions -DU_SHOW_CPLUSPLUS_API=0 -Wdeprecated-declarations -Winvalid-offsetof -fvisibility=hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wno-strict-prototypes") else () # Release Config set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -DNDEBUG -fPIC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=nehalem -O3 -DNDEBUG -ffunction-sections -fdata-sections -fPIC -std=c++14 -Wno-trigraphs -fno-exceptions -Wno-missing-field-initializers -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wsign-compare -Wno-shorten-64-to-32 -Wno-c++11-extensions -DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0 -DU_STATIC_IMPLEMENTATION=1 -Wdeprecated-declarations -Winvalid-offsetof -fvisibility=hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wno-strict-prototypes") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=nehalem -O3 -DNDEBUG -ffunction-sections -fdata-sections -fPIC -std=c++14 -Wno-trigraphs -fno-exceptions -Wno-missing-field-initializers -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wsign-compare -Wno-shorten-64-to-32 -Wno-c++11-extensions -DU_SHOW_CPLUSPLUS_API=0 -Wdeprecated-declarations -Winvalid-offsetof -fvisibility=hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wno-strict-prototypes") endif () # Allow relocatable binaries on Linux, load from executable path @@ -94,9 +94,9 @@ set(WTF_LIBRARY_TYPE SHARED) link_directories("${WEBKIT_LIBRARIES_DIR}/lib") link_directories("${ULTRALIGHTCORE_DIR}/bin") -set(ICU_LIBRARIES ${WEBKIT_LIBRARIES_DIR}/lib/libicuuc.a - ${WEBKIT_LIBRARIES_DIR}/lib/libicui18n.a - ${WEBKIT_LIBRARIES_DIR}/lib/libicudata.a) +set(ICU_LIBRARIES ${WEBKIT_LIBRARIES_DIR}/lib/libicuuc.so + ${WEBKIT_LIBRARIES_DIR}/lib/libicui18n.so + ${WEBKIT_LIBRARIES_DIR}/lib/libicudata.so) set(USE_GLIB 1) set(USE_CURL 1) From 9b90a73ebf092f4b014fe4fd4d29d729411205ec Mon Sep 17 00:00:00 2001 From: Tyler Young Date: Tue, 15 Sep 2020 02:35:23 -0400 Subject: [PATCH 4/4] add missing semicolons after U16_NEXT ctd. --- Source/WebCore/dom/Document.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index ad3eada70..03273ccfd 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -4941,12 +4941,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; } @@ -5006,7 +5006,7 @@ ExceptionOr> Document::parseQualifiedName(cons 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 };