libraries/webkitgtk: Patched for icu4c-65.1, disabled warnings spam.

Add workaround for bison-3.7.1 (thanks to chrisretusn on LQ),
add a fix for icu-68 (thanks to Spinlock on LQ)

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2020-12-08 15:10:19 +01:00 committed by Robby Workman
parent 5d3bc8d1f5
commit 964864c531
3 changed files with 64 additions and 1 deletions

View File

@ -0,0 +1,18 @@
--- webkitgtk-2.4.11.orig/GNUmakefile.in 2020-08-28 22:11:51.510864558 +0800
+++ webkitgtk-2.4.11.new/GNUmakefile.in 2020-08-28 22:24:17.657842406 +0800
@@ -82071,6 +82071,7 @@
$(GENSOURCES_WEBCORE)/XPathGrammar.cpp: $(WebCore)/xml/XPathGrammar.y
$(AM_V_GEN)
$(AM_V_at)perl $(WebCore)/css/makegrammar.pl --outputDir $(GENSOURCES_WEBCORE) --bison "$(BISON)" --symbolsPrefix xpathyy $<
+ $(AM_V_at)cp $(GENSOURCES_WEBCORE)/XPathGrammar.h $(GENSOURCES_WEBCORE)/XPathGrammar.hpp
# MathML tag and attribute names, and element factory
DerivedSources/WebCore/MathMLElementFactory.h: DerivedSources/WebCore/MathMLElementFactory.cpp
@@ -82129,6 +82130,7 @@
DerivedSources/WebCore/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y.in
$(AM_V_GEN)
$(AM_V_at)perl -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(feature_defines)" --outputDir $(GENSOURCES_WEBCORE) --bison "$(BISON)" --symbolsPrefix cssyy $<
+ $(AM_V_at)cp $(GENSOURCES_WEBCORE)/CSSGrammar.h $(GENSOURCES_WEBCORE)/CSSGrammar.hpp
DerivedSources/WebCore/UserAgentStyleSheetsData.cpp: DerivedSources/WebCore/UserAgentStyleSheets.h
DerivedSources/WebCore/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS)

View File

@ -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;
}

View File

@ -75,8 +75,14 @@ if pkg-config --exists geoclue ; then GEOCLUE="yes" ; else GEOCLUE="no" ; fi
# Fix for gcc-6.x # Fix for gcc-6.x
patch -p1 < $CWD/webkitgtk-2.4.9-abs.patch 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
patch -p1 < $CWD/bison-3.7.1.patch
# Disable excessive warnings spam
CFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \ CFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \
CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks -fpermissive" \ CXXFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1 -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 \ ./configure \
--prefix=/usr \ --prefix=/usr \
--disable-static \ --disable-static \