[ptxdist] [PATCH] cairo: Try to get rid of gtkdoc dependencies.

[ptxdist] [PATCH] cairo: Try to get rid of gtkdoc dependencies.

[Christian Melki]

Since the autoconf update, gtk-doc dependencies seems to
have become hard when running autoreconf.
Several other build environments default to building gtk-doc.
I'd prefer not to so this is an effort to disable doc
building entirely.

* Add patch to remove doc building.
* Remove gtk-doc options from rulefile.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...to-get-rid-of-gtkdocize-dependencies.patch | 89 +++++++++++++++++++
 patches/cairo-1.16.0/series                   |  3 +-
 rules/cairo.make                              |  3 -
 3 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch

diff --git a/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch b/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch
new file mode 100644
index 000000000..d37eaf278
--- /dev/null
+++ b/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch
@@ -0,0 +1,89 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Thu, 12 May 2022 19:40:34 +0200
+Subject: [PATCH] Try to get rid of gtkdocize dependencies.
+
+gtk-doc (gtkdocize) looks like a bugged hard dependency
+under autoconf > 2.69.
+Cut docs out.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ Makefile.am  | 8 +++-----
+ autogen.sh   | 7 -------
+ configure.ac | 5 -----
+ 3 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 03fa3523649f..1c5a8e8f5b47 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,8 +16,8 @@ EXTRA_DIST += \
+ 
+ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+ 
+-DIST_SUBDIRS = src doc util boilerplate test perf
+-SUBDIRS = src doc util
++DIST_SUBDIRS = src util boilerplate test perf
++SUBDIRS = src util
+ # libpng is required for our test programs
+ if CAIRO_HAS_PNG_FUNCTIONS
+ SUBDIRS += boilerplate test perf
+@@ -25,8 +25,6 @@ endif
+ 
+ configure: cairo-version.h
+ 
+-doc:
+-	cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
+ test retest recheck: all
+ 	cd test && $(MAKE) $(AM_MAKEFLAGS) $@
+ perf: all
+@@ -34,7 +32,7 @@ perf: all
+ check-valgrind: all
+ 	cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
+ 	cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
+-.PHONY: doc test retest recheck perf check-valgrind
++.PHONY: test retest recheck perf check-valgrind
+ 
+ 
+ EXTRA_DIST += \
+diff --git a/autogen.sh b/autogen.sh
+index 4b10251db941..c80d2b9e5688 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -13,13 +13,6 @@ if test -z $AUTORECONF; then
+         exit 1
+ fi
+ 
+-GTKDOCIZE=`which gtkdocize`
+-if test -z $GTKDOCIZE; then
+-        echo "*** No GTK-Doc found, documentation won't be generated ***"
+-else
+-        gtkdocize || exit $?
+-fi
+-
+ # create dummy */Makefile.am.features and ChangeLog to make automake happy
+ > boilerplate/Makefile.am.features
+ > src/Makefile.am.features
+diff --git a/configure.ac b/configure.ac
+index 5e33c96ea8b3..8d4cf0fe1ab1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,9 +22,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl Workaround for Automake 1.12
+ LT_PREREQ([2.2])
+ LT_INIT([win32-dll])
+ 
+-# Api documentation
+-GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
+-
+ AC_SYS_LARGEFILE
+ 
+ dnl ===========================================================================
+@@ -890,8 +887,6 @@ util/cairo-script/examples/Makefile
+ util/cairo-sphinx/Makefile
+ util/cairo-trace/Makefile
+ util/cairo-trace/cairo-trace
+-doc/Makefile
+-doc/public/Makefile
+ ])
+ AC_CONFIG_COMMANDS([cairo-trace],
+ 		   [chmod a+x util/cairo-trace/cairo-trace])
diff --git a/patches/cairo-1.16.0/series b/patches/cairo-1.16.0/series
index dc125547f..b08004c0d 100644
--- a/patches/cairo-1.16.0/series
+++ b/patches/cairo-1.16.0/series
@@ -3,4 +3,5 @@
 0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch
 0002-Makefile.sources-move-font-variations.c-a-test-code-.patch
 0003-regrouping-of-test-sources-with-new-fc_font_test_sou.patch
-# dfb78163a7d65338b42965982e516176  - git-ptx-patches magic
+0004-Try-to-get-rid-of-gtkdocize-dependencies.patch
+# bc9e55960c5fbeb015e3a298371e311f  - git-ptx-patches magic
diff --git a/rules/cairo.make b/rules/cairo.make
index e9e395b26..594f31ad8 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -39,9 +39,6 @@ CAIRO_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-shared \
 	--disable-static \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-atomic \
 	--disable-gcov \
-- 
2.34.1