[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1079-g19525b456

[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  19525b45615a69d64ab6201b42ed7e02003c5d3f (commit)
       via  db1537723b0bc92ec6065677e27a9a374578e9c2 (commit)
      from  d83e8056a6d01dcf65d61a9c9b5f85b3d7b8ce71 (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 19525b45615a69d64ab6201b42ed7e02003c5d3f
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jun 29 23:54:27 2023 +0200

    Use Makefile conditionals instead of shell conditionals

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c29d1125f..3e2900ba8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -319,25 +319,27 @@ html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile images $(XML_INPUTS)
 
 
 postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf: postgis-out.xml images $(XML_INPUTS)
-	if test x"$(DBLATEX)" = x; then \
-	   echo "Error: dblatex not found, can't build pdf"; \
-	   echo "       try installing dblatex and then re-run configure"; \
-	   false; \
-	else \
-		$(DBLATEX) -T native -t pdf \
-		   -x "--path $(XSLT_PATH)" \
-		   -I "${PWD}/html" \
-		   -P doc.collab.show=0 \
-		   -P figure.note="${PWD}/html/images/note" \
-		   -P figure.tip="${PWD}/html/images/tip" \
-		   -P figure.important="${PWD}/html/images/important" \
-		   -P figure.warning="${PWD}/html/images/warning" \
-		   -P figure.caution="${PWD}/html/images/caution" \
-		   -P latex.output.revhistory=0 \
-		   -s "$(abs_srcdir)/texstyle.sty" \
-		   -b xetex \
-		   -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
-	fi
+ifeq ($(DBLATEX),)
+	@echo
+	@echo "configure was unable to find the 'dblatex' utility program."
+	@echo "To create pdf files, install dblatex and then re-run configure."
+	@echo
+	false
+else
+	$(DBLATEX) -T native -t pdf \
+		 -x "--path $(XSLT_PATH)" \
+		 -I "${PWD}/html" \
+		 -P doc.collab.show=0 \
+		 -P figure.note="${PWD}/html/images/note" \
+		 -P figure.tip="${PWD}/html/images/tip" \
+		 -P figure.important="${PWD}/html/images/important" \
+		 -P figure.warning="${PWD}/html/images/warning" \
+		 -P figure.caution="${PWD}/html/images/caution" \
+		 -P latex.output.revhistory=0 \
+		 -s "$(abs_srcdir)/texstyle.sty" \
+		 -b xetex \
+		 -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<
+endif
 
 postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
 	if test x"$(DBTOEPUB)" = x; then \

commit db1537723b0bc92ec6065677e27a9a374578e9c2
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jun 29 23:51:53 2023 +0200

    Use xetex backend of dblatex, fixing the PDF build
    
    Closes #5419
    
    Note you now need the texlive-xetex to build the pdf

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e3294670a..c29d1125f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -335,6 +335,7 @@ postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSIO
 		   -P figure.caution="${PWD}/html/images/caution" \
 		   -P latex.output.revhistory=0 \
 		   -s "$(abs_srcdir)/texstyle.sty" \
+		   -b xetex \
 		   -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
 	fi
 

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

Summary of changes:
 doc/Makefile.in | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
PostGIS