[arch-commits] Commit in libxslt/trunk (4 files)
Jan Steffens
heftig at archlinux.org
Wed Jun 10 17:19:17 UTC 2020
Date: Wednesday, June 10, 2020 @ 17:19:16
Author: heftig
Revision: 388750
1.1.34-5: Fix the manpage
Added:
libxslt/trunk/0001-Make-generate-id-deterministic.patch
(from rev 388749, libxslt/trunk/0002-Make-generate-id-deterministic.patch)
libxslt/trunk/0002-Fix-manpage.patch
Modified:
libxslt/trunk/PKGBUILD
Deleted:
libxslt/trunk/0002-Make-generate-id-deterministic.patch
-------------------------------------------+
0001-Make-generate-id-deterministic.patch | 184 ++++++++++++++++++++++++++++
0002-Fix-manpage.patch | 45 ++++++
0002-Make-generate-id-deterministic.patch | 180 ---------------------------
PKGBUILD | 24 ++-
4 files changed, 244 insertions(+), 189 deletions(-)
Copied: libxslt/trunk/0001-Make-generate-id-deterministic.patch (from rev 388749, libxslt/trunk/0002-Make-generate-id-deterministic.patch)
===================================================================
--- 0001-Make-generate-id-deterministic.patch (rev 0)
+++ 0001-Make-generate-id-deterministic.patch 2020-06-10 17:19:16 UTC (rev 388750)
@@ -0,0 +1,184 @@
+From a94626df19f62bc7ee5aa8e65dd1995bed1a8092 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard at redhat.com>
+Date: Sun, 29 Oct 2017 01:04:54 +0200
+Subject: [PATCH 1/2] Make generate-id deterministic
+
+Origin: upstream, https://bugzilla.gnome.org/attachment.cgi?id=306475
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=751621
+Bug-Debian: https://bugs.debian.org/823857
+---
+ libxslt/functions.c | 91 ++++++++++++++++++++++++++++++++++++++++-
+ libxslt/functions.h | 7 ++++
+ libxslt/transform.c | 8 ++++
+ libxslt/xsltInternals.h | 2 +
+ 4 files changed, 107 insertions(+), 1 deletion(-)
+
+diff --git a/libxslt/functions.c b/libxslt/functions.c
+index b350545a..858a483a 100644
+--- a/libxslt/functions.c
++++ b/libxslt/functions.c
+@@ -671,6 +671,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
+ xmlXPathFreeObject(decimalObj);
+ }
+
++/**
++ * xsltCleanupIds:
++ * @ctxt: the transformation context
++ * @root: the root of the resulting document
++ *
++ * This clean up ids which may have been saved in Element contents
++ * by xsltGenerateIdFunction() to provide stable IDs on elements.
++ *
++ * Returns the number of items cleaned or -1 in case of error
++ */
++int
++xsltCleanupIds(xsltTransformContextPtr ctxt, xmlNodePtr root) {
++ xmlNodePtr cur;
++ int count = 0;
++
++ if ((ctxt == NULL) || (root == NULL))
++ return(-1);
++ if (root->type != XML_ELEMENT_NODE)
++ return(-1);
++
++ cur = root;
++ while (cur != NULL) {
++ if (cur->type == XML_ELEMENT_NODE) {
++ if (cur->content != NULL) {
++ cur->content = NULL;
++ count++;
++ }
++ if (cur->children != NULL) {
++ cur = cur->children;
++ continue;
++ }
++ }
++ if (cur->next != NULL) {
++ cur = cur->next;
++ continue;
++ }
++ do {
++ cur = cur->parent;
++ if (cur == NULL)
++ break;
++ if (cur == (xmlNodePtr) root) {
++ cur = NULL;
++ break;
++ }
++ if (cur->next != NULL) {
++ cur = cur->next;
++ break;
++ }
++ } while (cur != NULL);
++ }
++
++fprintf(stderr, "Attributed %d IDs for element, cleaned up %d\n",
++ ctxt->nextid, count);
++
++ return(count);
++}
++
+ /**
+ * xsltGenerateIdFunction:
+ * @ctxt: the XPath Parser context
+@@ -722,7 +779,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+ if (obj)
+ xmlXPathFreeObject(obj);
+
+- val = (long)((char *)cur - (char *)&base_address);
++ /*
++ * Try to provide stable ID for generated document:
++ * - usually ID are computed to be placed on elements via attributes
++ * so using the element as the node for the ID
++ * - the cur->content should be a correct placeholder for this, we use
++ * it to hold element node numbers in xmlXPathOrderDocElems to
++ * speed up XPath too
++ * - xsltCleanupIds() clean them up before handing the XSLT output
++ * to the API client.
++ * - other nodes types use the node address method but that should
++ * not end up in resulting document ID
++ * - we can enable this by default without risk of performance issues
++ * only the one pass xsltCleanupIds() is added
++ */
++ if (cur->type == XML_ELEMENT_NODE) {
++ if (cur->content == NULL) {
++ xsltTransformContextPtr tctxt;
++
++ tctxt = xsltXPathGetTransformContext(ctxt);
++ if (tctxt == NULL) {
++ val = (long)((char *)cur - (char *)&base_address);
++ } else {
++ tctxt->nextid++;
++ val = tctxt->nextid;
++ cur->content = (void *) (val);
++ }
++ } else {
++ val = (long) cur->content;
++ }
++ } else {
++ val = (long)((char *)cur - (char *)&base_address);
++ }
++
+ if (val >= 0) {
+ snprintf((char *)str, sizeof(str), "idp%ld", val);
+ } else {
+diff --git a/libxslt/functions.h b/libxslt/functions.h
+index 5455b7f4..31163613 100644
+--- a/libxslt/functions.h
++++ b/libxslt/functions.h
+@@ -63,6 +63,13 @@ XSLTPUBFUN void XSLTCALL
+ xsltFunctionAvailableFunction (xmlXPathParserContextPtr ctxt,
+ int nargs);
+
++/*
++ * Cleanup for ID generation
++ */
++XSLTPUBFUN int XSLTCALL
++ xsltCleanupIds (xsltTransformContextPtr ctxt,
++ xmlNodePtr root);
++
+ /*
+ * And the registration
+ */
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index d1c47932..3d1ee059 100644
+--- a/libxslt/transform.c
++++ b/libxslt/transform.c
+@@ -706,6 +706,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
+ cur->traceCode = (unsigned long*) &xsltDefaultTrace;
+ cur->xinclude = xsltGetXIncludeDefault();
+ cur->keyInitLevel = 0;
++ cur->nextid = 0;
+
+ return(cur);
+
+@@ -6140,6 +6141,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc,
+ if (root != NULL) {
+ const xmlChar *doctype = NULL;
+
++ /*
++ * cleanup ids which may have been saved in Elements content ptrs
++ */
++ if (ctxt->nextid != 0) {
++ xsltCleanupIds(ctxt, root);
++ }
++
+ if ((root->ns != NULL) && (root->ns->prefix != NULL))
+ doctype = xmlDictQLookup(ctxt->dict, root->ns->prefix, root->name);
+ if (doctype == NULL)
+diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h
+index 14a971aa..a7d71b57 100644
+--- a/libxslt/xsltInternals.h
++++ b/libxslt/xsltInternals.h
+@@ -1782,6 +1782,8 @@ struct _xsltTransformContext {
+ int maxTemplateVars;
+ unsigned long opLimit;
+ unsigned long opCount;
++
++ unsigned long nextid;/* for generating stable ids */
+ };
+
+ /**
+--
+2.27.0
+
Added: 0002-Fix-manpage.patch
===================================================================
--- 0002-Fix-manpage.patch (rev 0)
+++ 0002-Fix-manpage.patch 2020-06-10 17:19:16 UTC (rev 388750)
@@ -0,0 +1,45 @@
+From ea42953d3d75278f4f89009dfeed115200e4d102 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 10 Jun 2020 17:13:43 +0000
+Subject: [PATCH 2/2] Fix manpage
+
+Use the right stylesheet for DocBook 4. This fixes the bad whitespace
+processing.
+
+Use the just-built xsltproc to generate the manpage.
+---
+ doc/Makefile.am | 4 ++--
+ doc/xsltproc.xml | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 3d5364ca..6a7b9408 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -239,9 +239,9 @@ libxslt-api.xml libxslt-refs.xml EXSLT/libexslt-api.xml \
+ ($(XSLTPROC) -o ../libxslt/libxslt.syms $(srcdir)/syms.xsl $(srcdir)/symbols.xml)
+
+ xsltproc.1: $(srcdir)/xsltproc.xml
+- -@(if [ -x $(XSLTPROC) ] ; then \
++ -@(if [ -x $(srcdir)/../xsltproc/xsltproc ] ; then \
+ echo "Rebuilding the man pages from the xml" ; \
+- $(XSLTPROC) --nonet $(srcdir)/xsltproc.xml ; fi)
++ $(srcdir)/../xsltproc/xsltproc --nonet $(srcdir)/xsltproc.xml ; fi)
+
+ # Note that in the following, xmllint output is piped to xsltproc
+ search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
+diff --git a/doc/xsltproc.xml b/doc/xsltproc.xml
+index 08fc3e97..6ca1b323 100644
+--- a/doc/xsltproc.xml
++++ b/doc/xsltproc.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0"?>
+ <?xml-stylesheet type="text/xsl"
+- href="http://cdn.docbook.org/release/xsl/current//manpages/docbook.xsl"?>
++ href="http://cdn.docbook.org/release/xsl-nons/current/manpages/docbook.xsl"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+
+--
+2.27.0
+
Deleted: 0002-Make-generate-id-deterministic.patch
===================================================================
--- 0002-Make-generate-id-deterministic.patch 2020-06-10 17:18:26 UTC (rev 388749)
+++ 0002-Make-generate-id-deterministic.patch 2020-06-10 17:19:16 UTC (rev 388750)
@@ -1,180 +0,0 @@
-From: Daniel Veillard <veillard at redhat.com>
-Date: Sun, 29 Oct 2017 01:04:54 +0200
-Subject: Make generate-id deterministic
-
-Origin: upstream, https://bugzilla.gnome.org/attachment.cgi?id=306475
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=751621
-Bug-Debian: https://bugs.debian.org/823857
----
- libxslt/functions.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++-
- libxslt/functions.h | 7 ++++
- libxslt/transform.c | 8 +++++
- libxslt/xsltInternals.h | 2 ++
- 4 files changed, 107 insertions(+), 1 deletion(-)
-
-diff --git a/libxslt/functions.c b/libxslt/functions.c
-index b350545..858a483 100644
---- a/libxslt/functions.c
-+++ b/libxslt/functions.c
-@@ -671,6 +671,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
- xmlXPathFreeObject(decimalObj);
- }
-
-+/**
-+ * xsltCleanupIds:
-+ * @ctxt: the transformation context
-+ * @root: the root of the resulting document
-+ *
-+ * This clean up ids which may have been saved in Element contents
-+ * by xsltGenerateIdFunction() to provide stable IDs on elements.
-+ *
-+ * Returns the number of items cleaned or -1 in case of error
-+ */
-+int
-+xsltCleanupIds(xsltTransformContextPtr ctxt, xmlNodePtr root) {
-+ xmlNodePtr cur;
-+ int count = 0;
-+
-+ if ((ctxt == NULL) || (root == NULL))
-+ return(-1);
-+ if (root->type != XML_ELEMENT_NODE)
-+ return(-1);
-+
-+ cur = root;
-+ while (cur != NULL) {
-+ if (cur->type == XML_ELEMENT_NODE) {
-+ if (cur->content != NULL) {
-+ cur->content = NULL;
-+ count++;
-+ }
-+ if (cur->children != NULL) {
-+ cur = cur->children;
-+ continue;
-+ }
-+ }
-+ if (cur->next != NULL) {
-+ cur = cur->next;
-+ continue;
-+ }
-+ do {
-+ cur = cur->parent;
-+ if (cur == NULL)
-+ break;
-+ if (cur == (xmlNodePtr) root) {
-+ cur = NULL;
-+ break;
-+ }
-+ if (cur->next != NULL) {
-+ cur = cur->next;
-+ break;
-+ }
-+ } while (cur != NULL);
-+ }
-+
-+fprintf(stderr, "Attributed %d IDs for element, cleaned up %d\n",
-+ ctxt->nextid, count);
-+
-+ return(count);
-+}
-+
- /**
- * xsltGenerateIdFunction:
- * @ctxt: the XPath Parser context
-@@ -722,7 +779,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
- if (obj)
- xmlXPathFreeObject(obj);
-
-- val = (long)((char *)cur - (char *)&base_address);
-+ /*
-+ * Try to provide stable ID for generated document:
-+ * - usually ID are computed to be placed on elements via attributes
-+ * so using the element as the node for the ID
-+ * - the cur->content should be a correct placeholder for this, we use
-+ * it to hold element node numbers in xmlXPathOrderDocElems to
-+ * speed up XPath too
-+ * - xsltCleanupIds() clean them up before handing the XSLT output
-+ * to the API client.
-+ * - other nodes types use the node address method but that should
-+ * not end up in resulting document ID
-+ * - we can enable this by default without risk of performance issues
-+ * only the one pass xsltCleanupIds() is added
-+ */
-+ if (cur->type == XML_ELEMENT_NODE) {
-+ if (cur->content == NULL) {
-+ xsltTransformContextPtr tctxt;
-+
-+ tctxt = xsltXPathGetTransformContext(ctxt);
-+ if (tctxt == NULL) {
-+ val = (long)((char *)cur - (char *)&base_address);
-+ } else {
-+ tctxt->nextid++;
-+ val = tctxt->nextid;
-+ cur->content = (void *) (val);
-+ }
-+ } else {
-+ val = (long) cur->content;
-+ }
-+ } else {
-+ val = (long)((char *)cur - (char *)&base_address);
-+ }
-+
- if (val >= 0) {
- snprintf((char *)str, sizeof(str), "idp%ld", val);
- } else {
-diff --git a/libxslt/functions.h b/libxslt/functions.h
-index 5455b7f..3116361 100644
---- a/libxslt/functions.h
-+++ b/libxslt/functions.h
-@@ -63,6 +63,13 @@ XSLTPUBFUN void XSLTCALL
- xsltFunctionAvailableFunction (xmlXPathParserContextPtr ctxt,
- int nargs);
-
-+/*
-+ * Cleanup for ID generation
-+ */
-+XSLTPUBFUN int XSLTCALL
-+ xsltCleanupIds (xsltTransformContextPtr ctxt,
-+ xmlNodePtr root);
-+
- /*
- * And the registration
- */
-diff --git a/libxslt/transform.c b/libxslt/transform.c
-index d1c4793..3d1ee05 100644
---- a/libxslt/transform.c
-+++ b/libxslt/transform.c
-@@ -706,6 +706,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
- cur->traceCode = (unsigned long*) &xsltDefaultTrace;
- cur->xinclude = xsltGetXIncludeDefault();
- cur->keyInitLevel = 0;
-+ cur->nextid = 0;
-
- return(cur);
-
-@@ -6140,6 +6141,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc,
- if (root != NULL) {
- const xmlChar *doctype = NULL;
-
-+ /*
-+ * cleanup ids which may have been saved in Elements content ptrs
-+ */
-+ if (ctxt->nextid != 0) {
-+ xsltCleanupIds(ctxt, root);
-+ }
-+
- if ((root->ns != NULL) && (root->ns->prefix != NULL))
- doctype = xmlDictQLookup(ctxt->dict, root->ns->prefix, root->name);
- if (doctype == NULL)
-diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h
-index 14a971a..a7d71b5 100644
---- a/libxslt/xsltInternals.h
-+++ b/libxslt/xsltInternals.h
-@@ -1782,6 +1782,8 @@ struct _xsltTransformContext {
- int maxTemplateVars;
- unsigned long opLimit;
- unsigned long opCount;
-+
-+ unsigned long nextid;/* for generating stable ids */
- };
-
- /**
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-10 17:18:26 UTC (rev 388749)
+++ PKGBUILD 2020-06-10 17:19:16 UTC (rev 388750)
@@ -3,19 +3,21 @@
pkgname=libxslt
pkgver=1.1.34
-pkgrel=4
+pkgrel=5
pkgdesc="XML stylesheet transformation library"
url="http://xmlsoft.org/XSLT/"
arch=(x86_64)
license=(custom)
depends=(libxml2 libgcrypt)
-makedepends=(git)
+makedepends=(git docbook-xsl)
checkdepends=(docbook-xml python)
_commit=3653123f992db24cec417d12600f4c67388025e3 # tags/v1.1.34^0
source=("git+https://gitlab.gnome.org/GNOME/libxslt.git#commit=$_commit"
- 0002-Make-generate-id-deterministic.patch)
+ 0001-Make-generate-id-deterministic.patch
+ 0002-Fix-manpage.patch)
sha256sums=('SKIP'
- '371f8a27e57f648315d2ef73499e9bdc15bc3d83956c63b98eb6865f18411b62')
+ '80ffc45016b2c0b8edeb332ba587a8523ea5ed856229e7f531edd0af9742bab3'
+ 'd7dea109c91958e2231c06d9b841853855a666f93b001a1999beab42c3345203')
pkgver() {
cd $pkgname
@@ -25,16 +27,19 @@
prepare() {
cd $pkgname
- # Make xsltproc output reproducible for packages which use it to generate documentation.
- patch -Np1 -i $srcdir/0002-Make-generate-id-deterministic.patch
+ # Make xsltproc output reproducible for packages which use it to generate documentation
+ patch -Np1 -i ../0001-Make-generate-id-deterministic.patch
+ # Fix manpage whitespace and rebuild the manpage
+ patch -Np1 -i ../0002-Fix-manpage.patch
+ rm doc/xsltproc.1
+
NOCONFIGURE=1 ./autogen.sh
-
}
build() {
cd $pkgname
- ./configure --prefix=/usr --with-python=no
+ ./configure --prefix=/usr --without-python --disable-static
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
@@ -48,5 +53,6 @@
cd $pkgname
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- find "$pkgdir" -name '*.a' -print -delete
}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list