updated deps to get gtkplus to build (#22228)

* updated deps to get gtkplus to build

* gtk-doc requires docbook-xml 4.3

* patch gtk-doc build to find xml catalogs

* patch gtk-doc build to find xml catalogs

* patch gtk-doc build to find xml catalogs

* add new version, fix macOS build error

* reorder docbook versions from newest to oldest

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

8 files changed, 44 insertions, 1 deletions

diff --git a/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py b/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py
index 12fa949887..56c2db6bad 100644
--- a/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py
+++ b/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py
@@ -14,6 +14,9 @@ class AdwaitaIconTheme(AutotoolsPackage):
 
     version('3.38.0', sha256='6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97')
 
+    depends_on("gdk-pixbuf", type="build")
+    depends_on("librsvg", type="build")
+
     def setup_dependent_build_environment(self, env, dependent_spec):
         env.prepend_path('XDG_DATA_DIRS', self.prefix.share)
 
diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py
index a12452a6c8..ee1a5b830c 100644
--- a/var/spack/repos/builtin/packages/docbook-xml/package.py
+++ b/var/spack/repos/builtin/packages/docbook-xml/package.py
@@ -16,6 +16,7 @@ class DocbookXml(Package):
     list_depth = 1
 
     version('4.5', sha256='4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4')
+    version('4.3', sha256='23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464')
 
     def install(self, spec, prefix):
         install_tree('.', prefix)
diff --git a/var/spack/repos/builtin/packages/docbook-xsl/package.py b/var/spack/repos/builtin/packages/docbook-xsl/package.py
index 95c664e3b3..7f6a3e1b01 100644
--- a/var/spack/repos/builtin/packages/docbook-xsl/package.py
+++ b/var/spack/repos/builtin/packages/docbook-xsl/package.py
@@ -14,6 +14,7 @@ class DocbookXsl(Package):
     url      = "https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F1.79.2/docbook-xsl-1.79.2.tar.bz2"
 
     version('1.79.2', sha256='316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371')
+    version('1.78.1', sha256='c98f7296ab5c8ccd2e0bc07634976a37f50847df2d8a59bdb1e157664700b467', url='https://sourceforge.net/projects/docbook/files/docbook-xsl/1.78.1/docbook-xsl-1.78.1.tar.bz2')
 
     depends_on('docbook-xml')
 
diff --git a/var/spack/repos/builtin/packages/gtk-doc/build.patch b/var/spack/repos/builtin/packages/gtk-doc/build.patch
new file mode 100644
index 0000000000..eff4dfed5a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gtk-doc/build.patch
@@ -0,0 +1,25 @@
+diff -ru gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_check_xml_catalog.m4 gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_check_xml_catalog.m4
+--- gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_check_xml_catalog.m4	2021-03-17 08:00:49.717688000 -0700
++++ gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_check_xml_catalog.m4	2021-03-17 08:01:30.600655000 -0700
+@@ -6,7 +6,7 @@
+ 	AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+ 	AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+ 	if $jh_found_xmlcatalog && \
+-		AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++		AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+ 		AC_MSG_RESULT([found])
+ 		ifelse([$3],,,[$3])
+ 	else
+diff -ru gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_path_xml_catalog.m4 gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_path_xml_catalog.m4
+--- gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_path_xml_catalog.m4	2021-03-17 08:00:49.720681000 -0700
++++ gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_path_xml_catalog.m4	2021-03-17 08:09:44.424666000 -0700
+@@ -37,6 +37,9 @@
+ 				break
+ 			fi
+ 		done
++        if test -n "$XML_CATALOG_FILES"; then
++            jh_found_xmlcatalog=true
++        fi
+ 		IFS="$jh_xml_catalog_saved_ifs"
+ 	fi
+ 	if $jh_found_xmlcatalog; then
diff --git a/var/spack/repos/builtin/packages/gtk-doc/package.py b/var/spack/repos/builtin/packages/gtk-doc/package.py
index 2cec52ff7d..686a6783b2 100644
--- a/var/spack/repos/builtin/packages/gtk-doc/package.py
+++ b/var/spack/repos/builtin/packages/gtk-doc/package.py
@@ -32,9 +32,12 @@ class GtkDoc(AutotoolsPackage):
     depends_on('py-pygments', type=('build', 'run'))
     depends_on('libxslt')
     depends_on('libxml2')
-    depends_on('docbook-xsl')
+    depends_on('docbook-xsl@1.78.1')
+    depends_on('docbook-xml@4.3')
     # depends_on('dblatex', when='+pdf')
 
+    patch('build.patch')
+
     def url_for_version(self, version):
         """Handle gnome's version-based custom URLs."""
         url = 'https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/GTK_DOC_{0}/gtk-doc-GTK_DOC_{0}.tar.gz'
diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py
index 0f3e791729..eb6b6de671 100644
--- a/var/spack/repos/builtin/packages/gtkplus/package.py
+++ b/var/spack/repos/builtin/packages/gtkplus/package.py
@@ -39,6 +39,7 @@ class Gtkplus(MesonPackage):
     depends_on('gobject-introspection@1.39.0:')
     depends_on('shared-mime-info')
     depends_on('libxkbcommon')
+    depends_on('librsvg')
     depends_on('xrandr')
     depends_on('libepoxy', when='@3:')
     depends_on('libxi', when='@3:')
diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py
index 937acdbb98..788ae665e2 100644
--- a/var/spack/repos/builtin/packages/libcroco/package.py
+++ b/var/spack/repos/builtin/packages/libcroco/package.py
@@ -12,8 +12,15 @@ class Libcroco(AutotoolsPackage):
     homepage = "https://developer.gnome.org/libcroco"
     url      = "http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.12.tar.xz"
 
+    version('0.6.13', sha256='767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4')
     version('0.6.12', sha256='ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860')
 
     depends_on('glib')
     depends_on('libxml2')
+    depends_on('gtk-doc', type='build')
     depends_on('pkgconfig', type='build')
+
+    def configure_args(self):
+        # macOS ld does not support this flag
+        # https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/libcroco.rb
+        return ['--disable-Bsymbolic']
diff --git a/var/spack/repos/builtin/packages/librsvg/package.py b/var/spack/repos/builtin/packages/librsvg/package.py
index 0127fd49e9..edf246d52c 100644
--- a/var/spack/repos/builtin/packages/librsvg/package.py
+++ b/var/spack/repos/builtin/packages/librsvg/package.py
@@ -12,6 +12,7 @@ class Librsvg(AutotoolsPackage):
     homepage = "https://wiki.gnome.org/Projects/LibRsvg"
     url      = "https://download.gnome.org/sources/librsvg/2.44/librsvg-2.44.14.tar.xz"
 
+    version('2.51.0', sha256='89d32e38445025e1b1d9af3dd9d3aeb9f6fce527aeecbecf38b369b34c80c038')
     version('2.50.2', sha256='6211f271ce4cd44a7318190d36712e9cea384a933d3e3570004edeb210a056d3')
     version('2.50.0', sha256='b3fadba240f09b9c9898ab20cb7311467243e607cf8f928b7c5f842474ee3df4')
     version('2.44.14', sha256='6a85a7868639cdd4aa064245cc8e9d864dad8b8e9a4a8031bb09a4796bc4e303')
@@ -19,6 +20,7 @@ class Librsvg(AutotoolsPackage):
     depends_on("gobject-introspection", type='build')
     depends_on("pkgconfig", type='build')
     depends_on("rust", type='build')
+    depends_on('gtk-doc', type='build')
     depends_on("cairo+gobject")
     depends_on("gdk-pixbuf")
     depends_on("glib")