[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-547-g2a366e9b3

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  2a366e9b3cabe0855d00e9b53509076203bf0d8a (commit)
       via  bdac1913f560d851b92a7f9c8de7e4e6b313733f (commit)
      from  43d23f4ce7d21b32fa06964b89bc249d63a33d14 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2a366e9b3cabe0855d00e9b53509076203bf0d8a
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Sep 14 22:12:30 2023 +0200

    Use the legacy URI for docbook.xsl
    
    References #5539

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e6b3928aa..eaf8576f7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -111,7 +111,10 @@ XSLTPROC_CHUNKED_HTML_OPTS = \
 	--stringparam img.src.path ../ \
 	--stringparam html.stylesheet ../style.css
 
-DOCBOOK_XSLBASE=http://cdn.docbook.org/release/xsl/current
+# FIXME: the official URI would be http://cdn.docbook.org/release/xsl/current/
+# but see https://trac.osgeo.org/postgis/ticket/5539
+#DOCBOOK_XSLBASE=http://cdn.docbook.org/release/xsl/current
+DOCBOOK_XSLBASE=http://docbook.sourceforge.net/release/xsl-ns
 HTML_DOCBOOK_XSL=$(DOCBOOK_XSLBASE)/html/docbook.xsl
 CHUNK_HTML_DOCBOOK_XSL=$(DOCBOOK_XSLBASE)/html/chunk.xsl
 

commit bdac1913f560d851b92a7f9c8de7e4e6b313733f
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Sep 14 22:11:15 2023 +0200

    Search for xmlcatalog at configure time

diff --git a/configure.ac b/configure.ac
index 1ecbc1a22..f4b0a34e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,6 +205,12 @@ if test "x$XSLTPROC" = "x"; then
   CAN_BUILD_COMMENTS=no
 fi
 
+AC_PATH_PROG([XMLCATALOG], [xmlcatalog], [])
+if test "x$XMLCATALOG" = "x"; then
+	AC_MSG_WARN([xmlcatalog is not installed so documentation cannot be built])
+	CAN_BUILD_COMMENTS=no
+fi
+
 AC_PATH_PROG([XML2POT], [xml2pot], [])
 if test "x$XML2POT" = "x"; then
 	AC_MSG_WARN([xml2pot is not installed so translations cannot be updated])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b1b3c1b57..e6b3928aa 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -588,9 +588,9 @@ check-cheatsheets: requirements_not_met_xmllint
 else
 check-xml: postgis-out.xml
 	# Fail early if cannot find required RelaxNG
-	xmlcatalog "" "http://docbook.org/xml/5.0/rng/docbook.rng"
+	$(XMLCATALOG) "" "http://docbook.org/xml/5.0/rng/docbook.rng"
 	# Fail early if cannot find required DTD
-	xmlcatalog "" "http://docbook.org/xml/5.0/dtd/docbook.dtd"
+	$(XMLCATALOG) "" "http://docbook.org/xml/5.0/dtd/docbook.dtd"
 	# TODO: --schematron http://docbook.org/xml/5.0/sch/docbook.sch
 	# See https://trac.osgeo.org/postgis/ticket/5532
 	$(XMLLINT) --noout --nonet \

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    | 6 ++++++
 doc/Makefile.in | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS