Adding gtk-doc patch.

4 files changed, 30 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c13f8b7ce290..fc9e154fbeff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = webkitgtk
 	pkgdesc = Legacy Web content engine for GTK+ 3
 	pkgver = 2.4.11
-	pkgrel = 21
+	pkgrel = 22
 	epoch = 3
 	url = https://webkitgtk.org/
 	install = webkitgtk.install
@@ -43,6 +43,7 @@ pkgbase = webkitgtk
 	source = icu59.patch
 	source = pkgconfig-enchant-2.patch
 	source = icu68.patch
+	source = gtk-doc.patch
 	source = grammar.patch
 	sha256sums = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
 	sha256sums = e40f1e08665e1646ebc490141678f26c9c4a2792207fdf7c05978547eae9f61c
@@ -50,7 +51,8 @@ pkgbase = webkitgtk
 	sha256sums = 4e94e35b036f8a87a64e02d747d4103c0553dfe637fda372785c2b95211445ca
 	sha256sums = a1e2f24b28273746b2fbaecef42495f6314c76b16a446c22dc123e6a3afb58c8
 	sha256sums = d1a9ccc1ae5cb042bc47ae846ff84513ca7b9c7bc999c546ffba48572f0373a0
-	sha256sums = 24b49319500a79feb014ce2decd41db8ba7769c471bc8bfb42f761e2bc4d1ffb
+	sha256sums = 7341eb4c229656046be6ac526f94b9f4a742a66178412caf22a988677f5bf9d9
+	sha256sums = 5a62fbd0df69c6951562e72cd7b3c58cae7f2807338ced7b4a1973440b3dd193
 
 pkgname = webkitgtk
 
diff --git a/PKGBUILD b/PKGBUILD
index 62497b10fcf8..dec49e9d9776 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=webkitgtk
 pkgver=2.4.11
-pkgrel=21
+pkgrel=22
 epoch=3
 pkgdesc="Legacy Web content engine for GTK+ 3"
 arch=("armv7h" "i686" "x86_64")
@@ -31,6 +31,7 @@ source=(
   "icu59.patch"
   "pkgconfig-enchant-2.patch"
   "icu68.patch"
+  "gtk-doc.patch"
   "grammar.patch"
 )
 sha256sums=(
@@ -40,7 +41,8 @@ sha256sums=(
   "4e94e35b036f8a87a64e02d747d4103c0553dfe637fda372785c2b95211445ca"
   "a1e2f24b28273746b2fbaecef42495f6314c76b16a446c22dc123e6a3afb58c8"
   "d1a9ccc1ae5cb042bc47ae846ff84513ca7b9c7bc999c546ffba48572f0373a0"
-  "24b49319500a79feb014ce2decd41db8ba7769c471bc8bfb42f761e2bc4d1ffb"
+  "7341eb4c229656046be6ac526f94b9f4a742a66178412caf22a988677f5bf9d9"
+  "5a62fbd0df69c6951562e72cd7b3c58cae7f2807338ced7b4a1973440b3dd193"
 )
 
 prepare() {
@@ -54,6 +56,7 @@ prepare() {
   # https://www.archlinux.org/todo/enchant-221-rebuild/
   patch -Np1 -i "${srcdir}/pkgconfig-enchant-2.patch"
   patch -Np1 -i "${srcdir}/icu68.patch"
+  patch -Np1 -i "${srcdir}/gtk-doc.patch"
 
   # Needed as autotools-related files are patched
   autoreconf -ifv
diff --git a/grammar.patch b/grammar.patch
index 1ce69e247339..4371decd2a3b 100644
--- a/grammar.patch
+++ b/grammar.patch
@@ -1,8 +1,8 @@
 diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 4d151a2..df6b6f5 100644
+index 1732cff..7d4d21c 100644
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -95669,6 +95669,7 @@ $(GENSOURCES_WEBCORE)/XPathGrammar.h: $(GENSOURCES_WEBCORE)/XPathGrammar.cpp
+@@ -95674,6 +95674,7 @@ $(GENSOURCES_WEBCORE)/XPathGrammar.h: $(GENSOURCES_WEBCORE)/XPathGrammar.cpp
  $(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 $<
@@ -10,7 +10,7 @@ index 4d151a2..df6b6f5 100644
  
  # MathML tag and attribute names, and element factory
  DerivedSources/WebCore/MathMLElementFactory.h: DerivedSources/WebCore/MathMLElementFactory.cpp
-@@ -95727,6 +95728,7 @@ DerivedSources/WebCore/CSSGrammar.h: $(GENSOURCES_WEBCORE)/CSSGrammar.cpp
+@@ -95732,6 +95733,7 @@ DerivedSources/WebCore/CSSGrammar.h: $(GENSOURCES_WEBCORE)/CSSGrammar.cpp
  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 $<
diff --git a/gtk-doc.patch b/gtk-doc.patch
new file mode 100644
index 000000000000..581137fd9769
--- /dev/null
+++ b/gtk-doc.patch
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index d0bb1a1..5eee551 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,6 +36,13 @@ AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar])
+ AM_MAINTAINER_MODE([enable])
+ m4_include([Source/autotools/SetupAutomake.m4])
+ 
++# check for gtk-doc
++m4_ifdef([GTK_DOC_CHECK], [
++GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
++],[
++AM_CONDITIONAL([ENABLE_GTK_DOC], false)
++])
++
+ ######################################################################################
+ # Processing of configuration files
+ ######################################################################################