aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-02-22 20:20:10 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-02-22 20:20:10 -0300
commit2f891dd83849af655672f1cf446ad6882717569e (patch)
treee51d150b6f0ba33089a65da7d6674220835eaa8e
parentf616747b85c3e2fc47de1f55a771d270bd417bfb (diff)
downloadaports-2f891dd83849af655672f1cf446ad6882717569e.tar.bz2
aports-2f891dd83849af655672f1cf446ad6882717569e.tar.xz
community/qt5-qtwebkit: fix build
-rw-r--r--community/qt5-qtwebkit/APKBUILD4
-rw-r--r--community/qt5-qtwebkit/icu.patch41
2 files changed, 44 insertions, 1 deletions
diff --git a/community/qt5-qtwebkit/APKBUILD b/community/qt5-qtwebkit/APKBUILD
index 1fcb30f0b8..3f454c07c1 100644
--- a/community/qt5-qtwebkit/APKBUILD
+++ b/community/qt5-qtwebkit/APKBUILD
@@ -42,6 +42,7 @@ source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtwebkit-o
fix-execinfo.patch
0001-Add-ARM-64-support.patch
qt5.12.patch
+ icu.patch
"
builddir="$srcdir/qtwebkit-opensource-src-$_v"
@@ -82,4 +83,5 @@ sha512sums="79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ff
00d59c0cdb58ae8e7cf6bc3d03f133697e74c267ccebe12238bcdc274d4c90210b82c2d8bdf0e949cd43da13a4fd8a4c35fb54a00ed5102a4ac4d23aa002d0fe fix-rpath.patch
f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f fix-execinfo.patch
af5097d44f73de156ca31a5423136301dfc12ae693e20c4702bf3f1c6e16395f3912e9268582480ba3177021f37d4cae3b84d4b23eeb063fdc40f2444d3b34c8 0001-Add-ARM-64-support.patch
-5e056bc410892dee53825b191d227a669bba75579bdcf20a671afc063200a6dfd8348dff65f3560a3a9726c07b627be3ba9ac151b05d9bc6535da7d7669018f8 qt5.12.patch"
+5e056bc410892dee53825b191d227a669bba75579bdcf20a671afc063200a6dfd8348dff65f3560a3a9726c07b627be3ba9ac151b05d9bc6535da7d7669018f8 qt5.12.patch
+e92cc6862f72902a18669575286a80f6a0bb510514731ddef0968a13fd83cf3744b03efbfe6709cac4ff5fe73c68b292f208a806d31dab139ded51229b356a2c icu.patch"
diff --git a/community/qt5-qtwebkit/icu.patch b/community/qt5-qtwebkit/icu.patch
new file mode 100644
index 0000000000..c6f8fb6779
--- /dev/null
+++ b/community/qt5-qtwebkit/icu.patch
@@ -0,0 +1,41 @@
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index af63b141..26f7312b 100644
+--- a/Source/WebCore/dom/Document.cpp
++++ b/Source/WebCore/dom/Document.cpp
+@@ -3846,12 +3846,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;
+ }
+@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
+ 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;
+diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
+index efb20a8c..99b3e86c 100644
+--- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp
++++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
+@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length)
+ {
+ 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;
+ }