Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis
Commits: bda4268f by Bas Couwenberg at 2023-07-15T18:49:14+02:00 Add upstream patch to use xlstproc instead of xmllint to extract tags. - - - - - 3fc4c6a3 by Bas Couwenberg at 2023-07-15T19:15:53+02:00 Set distribution to experimental. - - - - - 3 changed files: - debian/changelog - + debian/patches/pr132.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +postgis (3.4.0~beta1+dfsg-1~exp3) experimental; urgency=medium + + * Add upstream patch to use xlstproc instead of xmllint to extract tags. + + -- Bas Couwenberg <[email protected]> Sat, 15 Jul 2023 19:15:40 +0200 + postgis (3.4.0~beta1+dfsg-1~exp2) experimental; urgency=medium * Add libxml2-utils to build dependencies for xmllint. ===================================== debian/patches/pr132.patch ===================================== @@ -0,0 +1,52 @@ +Description: Drop xmllint requirement for extracting tags +Author: Sandro Santilli <[email protected]> +Origin: https://git.osgeo.org/gitea/postgis/postgis/pulls/132 +Bug: https://trac.osgeo.org/postgis/ticket/5446 + +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -300,13 +300,13 @@ $(XSL_GENERATED_SOURCES): %.xsl.xml: xsl + $(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< postgis-nospecial.xml + endif + +-ifeq ($(XMLLINT),) +-$(TAG_GENERATED_SOURCES): requirements_not_met_xmllint ++ifeq ($(XSLTPROC),) ++$(TAG_GENERATED_SOURCES): requirements_not_met_xsltproc + else +-$(TAG_GENERATED_SOURCES): xsl-config.xml Makefile ++$(TAG_GENERATED_SOURCES): xsl/node_by_xpath.xsl xsl-config.xml Makefile + tag=tag_$(basename $(notdir $@)); \ +- $(XMLLINT) --xpath "/config/tags/para[@role='$$tag']/node()" $< > [email protected] && \ +- mv [email protected] $@ ++ $(XSLTPROC) --stringparam xpath "/config/tags/para[@role='$$tag']" -o $@ $< xsl-config.xml ++ test -s $@ # ensure something was extracted + endif + + $(GENERATED_COMMENT_FILES): %.sql: xsl/%.sql.xsl $(XML_INPUTS) postgis-out.xml +--- /dev/null ++++ b/doc/xsl/node_by_xpath.xsl +@@ -0,0 +1,23 @@ ++<?xml version="1.0"?> ++ ++<!-- ++Example usage: ++ xsltproc \ ++ -stringparam pattern "/config/tags/para[@role='tag_P_support']" ++ -stringparam value '.' xsl/extract_xpath.xsl ++ xsl-config.xml ++--> ++ ++<xsl:stylesheet ++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0" ++ xmlns:dyn="http://exslt.org/dynamic"; extension-element-prefixes="dyn" ++> ++ <xsl:output method="xml" omit-xml-declaration="yes" indent="no" /> ++ ++ <xsl:template match="/"> ++ <xsl:for-each select="dyn:evaluate($xpath)"> ++ <xsl:copy-of select="." /> ++ </xsl:for-each> ++ </xsl:template> ++</xsl:stylesheet> ++ ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ chaikin incorrect-path-for-interpreter.patch destdir.patch install.patch +pr132.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/2d9ff6c8ba4b18a87a4ae121cd3fcfac3791703d...3fc4c6a386f166edf9cab386975887f076ce2697 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/2d9ff6c8ba4b18a87a4ae121cd3fcfac3791703d...3fc4c6a386f166edf9cab386975887f076ce2697 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
