[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-386-g8876c8346
git at osgeo.org
git at osgeo.org
Mon Sep 11 09:07:15 PDT 2023
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 8876c8346689682039d1edd5ac65ce9a8b03ca8c (commit)
via cd951d0174cfc6f54163cd564437d10297a82db8 (commit)
via ff2f845eb990ee26da057dfb5b2440ccd81c667a (commit)
via f3278fea77546a5190d8e1182598532166a8c2c1 (commit)
via 0d89059d6d75781256f20ca320ca27f6b7488ce9 (commit)
via 02271e82c75991d44d2400a6a6f9520edc429d10 (commit)
via cb8644faef62847143a22ff3ea02ae67b02e1bbc (commit)
via 9a7071fcb9dc15c2615f3e35cac6fc2e9789b958 (commit)
via 9446f3a2a27afcb08011ca637ceafbd71aaafcb0 (commit)
via c2019671aab9468b209a3d0f8c64e9c6b1b860c5 (commit)
via f7d8b20e7e44bab8447b9dc9c47e8fb3a91beca3 (commit)
from 1cfa9001fe195c384502273b94933bdcfb6f5c8d (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 8876c8346689682039d1edd5ac65ce9a8b03ca8c
Merge: 1cfa9001f cd951d017
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Sep 11 09:07:08 2023 -0700
Merge branch 'lbartoletti-patch-3'
commit cd951d0174cfc6f54163cd564437d10297a82db8
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 17:22:03 2023 +0200
Fix dependencies on xml inputs
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0c7b1e749..e9bc4a6c0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -230,6 +230,7 @@ XML_GENERATED_SOURCES = \
XML_INPUTS = $(XML_SOURCES) $(XML_GENERATED_SOURCES) $(TAG_GENERATED_SOURCES)
+# TODO: should these be XML_SOURCES ?
XML_INPUTS_POT = $(XML_SOURCES:%.xml=$(srcdir)/po/templates/%.xml.pot)
GENERATED_COMMENT_FILES = $(patsubst \
@@ -307,10 +308,10 @@ $(TAG_GENERATED_SOURCES): xsl/node_by_xpath.xsl xsl-config.xml | Makefile
test -s $@ # ensure something was extracted
endif
-$(GENERATED_COMMENT_FILES): %.sql: xsl/%.sql.xsl $(XML_INPUTS) postgis-out.xml
+$(GENERATED_COMMENT_FILES): %.sql: xsl/%.sql.xsl postgis-out.xml
$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< postgis-out.xml
-$(GENERATED_CHEATSHEET_FILES): $(html_builddir)/%$(DOCSUFFIX).html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml xsl/common_cheatsheet.xsl xsl/common_utils.xsl
+$(GENERATED_CHEATSHEET_FILES): $(html_builddir)/%$(DOCSUFFIX).html: xsl/%.html.xsl postgis-out.xml xsl/common_cheatsheet.xsl xsl/common_utils.xsl
$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) $(XSLTPROC_CUSTOM_VARS) -o $@ $< postgis-out.xml
postgis-nospecial.xml: postgis.xml $(XML_SOURCES) $(TAG_GENERATED_SOURCES) Makefile
@@ -323,7 +324,7 @@ postgis-out.xml: postgis.xml Makefile $(XML_INPUTS) Makefile
$(XMLLINT) $(XSLTPROC_PATH_OPT) --noent -o $@ $@.in
chunked-html: $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css
-$(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
+$(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
$(XSLTPROC_CHUNKED_HTML_OPTS) \
--output $(dir $@) \
@@ -331,7 +332,7 @@ $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML
$<
chunked-html-web: $(html_builddir)/postgis-web$(DOCSUFFIX)/docbook.css
-$(html_builddir)/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
+$(html_builddir)/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
$(XSLTPROC_CHUNKED_HTML_OPTS) \
--output $(dir $@) \
@@ -341,7 +342,7 @@ $(html_builddir)/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $
HTML_BITS = $(wildcard html/*.html)
chunked-html-web-mobile: $(html_builddir)/postgis-web-mobile$(DOCSUFFIX)/docbook.css
-$(html_builddir)/postgis-web-mobile$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
+$(html_builddir)/postgis-web-mobile$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
$(XSLTPROC_CHUNKED_HTML_OPTS) \
--output $(dir $@) \
@@ -359,7 +360,7 @@ html: $(html_builddir)/postgis$(DOCSUFFIX).html
$(MAKE) -C po/$$lang local-$$rule || exit 1; \
done
-$(html_builddir)/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile $(XML_INPUTS)
+$(html_builddir)/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
--stringparam html.stylesheet style.css \
--output $(html_builddir)/postgis$(DOCSUFFIX).html \
@@ -367,7 +368,7 @@ $(html_builddir)/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile $(XML_INPUTS
$<
-postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf: postgis-out.xml $(abs_srcdir)/texstyle-common.sty $(abs_srcdir)/texstyle.sty $(XML_INPUTS) | images
+postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf: postgis-out.xml $(abs_srcdir)/texstyle-common.sty $(abs_srcdir)/texstyle.sty | images
ifeq ($(DBLATEX),)
@echo
@echo "configure was unable to find the 'dblatex' utility program."
@@ -398,7 +399,7 @@ pdf-install: postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS
pdf-uninstall:
rm -f $(DESTDIR)$(docdir)/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf
-postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
+postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images
ifeq ($(DBTOEPUB),)
@echo
@echo "configure was unable to find the 'dbtoepub' utility program."
@@ -574,7 +575,7 @@ ifeq ($(XMLLINT),)
check-xml: requirements_not_met_xmllint
check-cheatsheets: requirements_not_met_xmllint
else
-check-xml: $(XML_INPUTS)
+check-xml: postgis-out.xml
$(XMLLINT) --loaddtd $(XSLTPROC_PATH_OPT) --xinclude --valid postgis-out.xml --noout
check-cheatsheets: cheatsheets
commit ff2f845eb990ee26da057dfb5b2440ccd81c667a
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 17:17:04 2023 +0200
Properly clean generated xml inputs
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d1b7560c0..0c7b1e749 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -455,7 +455,8 @@ cheatsheet-clean:
clean: images-clean html-clean pdf-clean epub-clean cheatsheet-clean
rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422
rm -f $(XML_GENERATED_SOURCES)
- rm -f postgis-nospecial.xml
+ rm -f postgis-nospecial.xml postgis-nospecial.xml.in
+ rm -f postgis-out.xml postgis-out.xml.in
rm -f $(TAG_GENERATED_SOURCES)
$(MAKE) -C $(images_builddir) clean
rm -f postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
commit f3278fea77546a5190d8e1182598532166a8c2c1
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 16:32:14 2023 +0200
Resolve XML entities only once
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9642d2e65..d1b7560c0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -226,8 +226,7 @@ TAG_GENERATED_SOURCES = \
Z_support.tag
XML_GENERATED_SOURCES = \
- $(XSL_GENERATED_SOURCES) \
- postgis-out.xml \
+ $(XSL_GENERATED_SOURCES)
XML_INPUTS = $(XML_SOURCES) $(XML_GENERATED_SOURCES) $(TAG_GENERATED_SOURCES)
@@ -292,9 +291,6 @@ update-po: $(XML_INPUTS_POT)
done
endif
-postgis-nospecial.xml: postgis-out.xml
- grep -v '\&postgis_special;' $< > $@
-
ifeq ($(XSLTPROC),)
$(XSL_GENERATED_SOURCES): requirements_not_met_xsltproc
else
@@ -317,9 +313,14 @@ $(GENERATED_COMMENT_FILES): %.sql: xsl/%.sql.xsl $(XML_INPUTS) postgis-out.xml
$(GENERATED_CHEATSHEET_FILES): $(html_builddir)/%$(DOCSUFFIX).html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml xsl/common_cheatsheet.xsl xsl/common_utils.xsl
$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) $(XSLTPROC_CUSTOM_VARS) -o $@ $< postgis-out.xml
+postgis-nospecial.xml: postgis.xml $(XML_SOURCES) $(TAG_GENERATED_SOURCES) Makefile
+ grep -v '\&postgis_special;' $< > $@.in
+ $(XMLLINT) $(XSLTPROC_PATH_OPT) --noent -o $@ $@.in
+
# TODO: use a postgis_release_version variable passed via --stringparam
-postgis-out.xml: postgis.xml Makefile
- $(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
+postgis-out.xml: postgis.xml Makefile $(XML_INPUTS) Makefile
+ $(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@.in
+ $(XMLLINT) $(XSLTPROC_PATH_OPT) --noent -o $@ $@.in
chunked-html: $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css
$(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
commit 0d89059d6d75781256f20ca320ca27f6b7488ce9
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 16:33:44 2023 +0200
Fix nested informaltable tag and empty style attribute
diff --git a/doc/using_postgis_query.xml b/doc/using_postgis_query.xml
index 42faa28d2..59f7561d0 100644
--- a/doc/using_postgis_query.xml
+++ b/doc/using_postgis_query.xml
@@ -172,8 +172,7 @@
valign="middle" />
</informalfigure></para></entry>
- <entry><para> <informaltable tabstyle="styledtable">
- <tgroup align="center" cols="4">
+ <entrytbl cols="4">
<thead valign="middle">
<row>
<entry></entry>
@@ -191,8 +190,9 @@
<tbody valign="middle">
<row>
- <entry spanname="de9im_a" style=""><emphasis
- role="bold">Interior</emphasis></entry>
+ <entry spanname="de9im_a">
+ <emphasis role="bold">Interior</emphasis>
+ </entry>
<entry><para><informalfigure>
<graphic fileref="images/de9im05.png" />
@@ -259,8 +259,7 @@
role="bold">2</emphasis></para></entry>
</row>
</tbody>
- </tgroup>
- </informaltable></para></entry>
+ </entrytbl>
</row>
</tbody>
</tgroup>
commit 02271e82c75991d44d2400a6a6f9520edc429d10
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 11:09:47 2023 +0200
[woodie] print xmllint version
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index fada45c27..0a456bb48 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -29,6 +29,7 @@ steps:
- mkdir -p build-docs && cd build-docs
- ../configure --without-pg --without-protobuf --without-raster
- make postgis_revision.h
+ - xmllint --version
when:
path: *when_path_full
check-xml:
commit cb8644faef62847143a22ff3ea02ae67b02e1bbc
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 11:20:14 2023 +0200
Cleanup the SQL-MM Compliant function list
Reduce details, as done in all other sections
diff --git a/doc/xsl/list_sqlmm_functions.xml.xsl b/doc/xsl/list_sqlmm_functions.xml.xsl
index 93b893e84..74617a051 100644
--- a/doc/xsl/list_sqlmm_functions.xml.xsl
+++ b/doc/xsl/list_sqlmm_functions.xml.xsl
@@ -30,7 +30,7 @@
<xsl:for-each select="refsection">
<xsl:choose>
<xsl:when test="descendant::node()[@conformance='sqlmm']">
- <listitem><simpara><link linkend="{$refid}"><xsl:value-of select="$refid" /></link> - <xsl:value-of select="$comment" /> <xsl:value-of select="." /></simpara></listitem>
+ <listitem><simpara><link linkend="{$refid}"><xsl:value-of select="$refid" /></link> - <xsl:value-of select="$comment" /></simpara></listitem>
</xsl:when>
</xsl:choose>
</xsl:for-each>
commit 9a7071fcb9dc15c2615f3e35cac6fc2e9789b958
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 10:43:04 2023 +0200
Fix nested <para> tag in docbook
Closes #5530
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a589af250..9642d2e65 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -307,7 +307,7 @@ $(TAG_GENERATED_SOURCES): requirements_not_met_xsltproc
else
$(TAG_GENERATED_SOURCES): xsl/node_by_xpath.xsl xsl-config.xml | Makefile
tag=tag_$(basename $(notdir $@)); \
- $(XSLTPROC) --stringparam xpath "/config/tags/para[@role='$$tag']" -o $@ $^
+ $(XSLTPROC) --stringparam xpath "/config/tags/para[@role='$$tag']/node()" -o $@ $^
test -s $@ # ensure something was extracted
endif
commit 9446f3a2a27afcb08011ca637ceafbd71aaafcb0
Author: Regina Obe <lr at pcorp.us>
Date: Mon Sep 11 03:01:48 2023 -0400
Get rid of path override. Paths already set as part of winnie_common.sh
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 7ec9944c3..d9ec230b8 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -35,9 +35,7 @@ export REL_PGVER=${PG_VER//./} #strip the period
export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
-export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
-#PATH="${PGPATH}/bin:${PGPATH}/lib:${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
-#echo PATH AFTER: $PATH
+
outdir="${RELDIR}/${RELVERDIR}"
package="${RELDIR}/${RELVERDIR}.zip"
verfile="${RELDIR}/${RELVERDIR}/version.txt"
commit c2019671aab9468b209a3d0f8c64e9c6b1b860c5
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 11 08:56:15 2023 +0200
We're not using math2ml anymore, so stop looking for it
diff --git a/configure.ac b/configure.ac
index 96a1d50fa..de25dd878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,27 +319,6 @@ fi
AC_SUBST([XSLBASE])
-dnl
-dnl Let's see if we can find mathml2.dtd
-dnl
-AC_ARG_WITH([mathmldtd],
- [AS_HELP_STRING([--with-mathmldtd=PATH], [specify the dtd path for mathml2.dtd])],
- [MATHML2_DTD="$withval"], [MATHML2_DTD=""])
-dnl TODO: get more paths to add here...
-if test "x$MATHML2_DTD" = "x"; then
- MATHML2_DTD="http://www.w3.org/Math/DTD/mathml2/mathml2.dtd"
- SEARCHPATH="
- /usr/share/xml/schema/w3c/mathml/dtd
- "
- for p in ${SEARCHPATH}; do
- if test -r "${p}"/mathml2.dtd; then
- MATHML2_DTD="${p}/mathml2.dtd"
- break
- fi
- done
-fi
-AC_SUBST([MATHML2_DTD])
-
dnl ===========================================================================
dnl Detect if pkg-config installed
dnl ===========================================================================
@@ -1894,7 +1873,6 @@ AC_MSG_RESULT([ xsltproc: ${XSLTPROC}])
AC_MSG_RESULT([ xsl style sheets: ${XSLBASE}])
AC_MSG_RESULT([ dblatex: ${DBLATEX}])
AC_MSG_RESULT([ convert: ${CONVERT}])
-AC_MSG_RESULT([ mathml2.dtd: ${MATHML2_DTD}])
AC_MSG_RESULT()
if test "$POSTGIS_GEOS_VERSION" -lt 31200; then
commit f7d8b20e7e44bab8447b9dc9c47e8fb3a91beca3
Author: Loïc Bartoletti <lbartoletti at users.noreply.github.com>
Date: Mon Sep 11 07:56:10 2023 +0200
lwline.c: fix a typo
diff --git a/liblwgeom/lwline.c b/liblwgeom/lwline.c
index 936d9503c..999927fea 100644
--- a/liblwgeom/lwline.c
+++ b/liblwgeom/lwline.c
@@ -372,7 +372,7 @@ lwline_setPoint4d(LWLINE *line, uint32_t index, POINT4D *newpoint)
}
/**
-* Re-write the measure ordinate (or add one, if it isn't already there) interpolating
+* Re-write the measure coordinate (or add one, if it isn't already there) interpolating
* the measure between the supplied start and end values.
*/
LWLINE*
-----------------------------------------------------------------------
Summary of changes:
liblwgeom/lwline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list