diff options
Diffstat (limited to 'libraries/webkitgtk3')
-rw-r--r-- | libraries/webkitgtk3/icu4c-65.1.patch | 39 | ||||
-rw-r--r-- | libraries/webkitgtk3/webkitgtk3.SlackBuild | 8 |
2 files changed, 45 insertions, 2 deletions
diff --git a/libraries/webkitgtk3/icu4c-65.1.patch b/libraries/webkitgtk3/icu4c-65.1.patch new file mode 100644 index 0000000000..841f03a07b --- /dev/null +++ b/libraries/webkitgtk3/icu4c-65.1.patch @@ -0,0 +1,39 @@ +diff -Naur webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp +--- webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp 2016-04-10 08:48:37.000000000 +0200 ++++ webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp 2019-10-07 17:41:57.798058000 +0200 +@@ -3912,12 +3912,12 @@ + 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; + } +@@ -3980,7 +3980,7 @@ + const UChar* s = qualifiedName.deprecatedCharacters(); + 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 -Naur webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp +--- webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2016-04-10 08:48:37.000000000 +0200 ++++ webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-10-07 17:22:38.534058000 +0200 +@@ -61,7 +61,7 @@ + { + 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; + } diff --git a/libraries/webkitgtk3/webkitgtk3.SlackBuild b/libraries/webkitgtk3/webkitgtk3.SlackBuild index e33636bf82..09cbd02f7b 100644 --- a/libraries/webkitgtk3/webkitgtk3.SlackBuild +++ b/libraries/webkitgtk3/webkitgtk3.SlackBuild @@ -79,8 +79,12 @@ if pkg-config --exists geoclue ; then GEOCLUE="yes" ; else GEOCLUE="no" ; fi # Fix for gcc-6.x patch -p1 < $CWD/webkitgtk-2.4.9-abs.patch +# https://bugs.webkit.org/show_bug.cgi?id=202600 +patch -p1 < $CWD/icu4c-65.1.patch + +# Disable excessive warnings spam CFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks -fpermissive -Wno-deprecated-declarations -Wno-deprecated-copy -Wno-expansion-to-defined -Wno-class-memaccess -Wno-ignored-qualifiers -Wno-redundant-move -Wno-misleading-indentation -Wno-cast-function-type" \ ./configure \ --prefix=/usr \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -88,7 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-gtk=3.0 \ --enable-introspection \ - --enable-webkit2 \ + --enable-webkit2=no \ --enable-geolocation=$GEOCLUE \ --build=$ARCH-slackware-linux |