[arch-commits] Commit in libxslt/repos/testing-x86_64 (4 files)
Jan Steffens
heftig at gemini.archlinux.org
Tue Aug 30 17:57:36 UTC 2022
Date: Tuesday, August 30, 2022 @ 17:57:36
Author: heftig
Revision: 454783
archrelease: copy trunk to testing-x86_64
Added:
libxslt/repos/testing-x86_64/0001-Make-generate-id-deterministic.patch
(from rev 454782, libxslt/trunk/0001-Make-generate-id-deterministic.patch)
libxslt/repos/testing-x86_64/PKGBUILD
(from rev 454782, libxslt/trunk/PKGBUILD)
Deleted:
libxslt/repos/testing-x86_64/0001-Make-generate-id-deterministic.patch
libxslt/repos/testing-x86_64/PKGBUILD
-------------------------------------------+
0001-Make-generate-id-deterministic.patch | 362 ++++++++++++++--------------
PKGBUILD | 169 ++++++-------
2 files changed, 268 insertions(+), 263 deletions(-)
Deleted: 0001-Make-generate-id-deterministic.patch
===================================================================
--- 0001-Make-generate-id-deterministic.patch 2022-08-30 17:54:52 UTC (rev 454782)
+++ 0001-Make-generate-id-deterministic.patch 2022-08-30 17:57:36 UTC (rev 454783)
@@ -1,181 +0,0 @@
-From 0000000000000000000000000000000000000000 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] 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 ed2b002362dc..9c4408b325bd 100644
---- a/libxslt/functions.c
-+++ b/libxslt/functions.c
-@@ -662,6 +662,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
-@@ -713,7 +770,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 5455b7f47802..31163613f6e9 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 cb43bb47d997..bc1c6afcfdd8 100644
---- a/libxslt/transform.c
-+++ b/libxslt/transform.c
-@@ -705,6 +705,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
- cur->traceCode = (unsigned long*) &xsltDefaultTrace;
- cur->xinclude = xsltGetXIncludeDefault();
- cur->keyInitLevel = 0;
-+ cur->nextid = 0;
-
- return(cur);
-
-@@ -6037,6 +6038,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 14343d2751c8..9d3ff5fc0c06 100644
---- a/libxslt/xsltInternals.h
-+++ b/libxslt/xsltInternals.h
-@@ -1786,6 +1786,8 @@ struct _xsltTransformContext {
- int maxTemplateVars;
- unsigned long opLimit;
- unsigned long opCount;
-+
-+ unsigned long nextid;/* for generating stable ids */
- };
-
- /**
Copied: libxslt/repos/testing-x86_64/0001-Make-generate-id-deterministic.patch (from rev 454782, libxslt/trunk/0001-Make-generate-id-deterministic.patch)
===================================================================
--- 0001-Make-generate-id-deterministic.patch (rev 0)
+++ 0001-Make-generate-id-deterministic.patch 2022-08-30 17:57:36 UTC (rev 454783)
@@ -0,0 +1,181 @@
+From 0000000000000000000000000000000000000000 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] 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 ed2b002362dc..9c4408b325bd 100644
+--- a/libxslt/functions.c
++++ b/libxslt/functions.c
+@@ -662,6 +662,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
+@@ -713,7 +770,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 5455b7f47802..31163613f6e9 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 cb43bb47d997..bc1c6afcfdd8 100644
+--- a/libxslt/transform.c
++++ b/libxslt/transform.c
+@@ -705,6 +705,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
+ cur->traceCode = (unsigned long*) &xsltDefaultTrace;
+ cur->xinclude = xsltGetXIncludeDefault();
+ cur->keyInitLevel = 0;
++ cur->nextid = 0;
+
+ return(cur);
+
+@@ -6037,6 +6038,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 14343d2751c8..9d3ff5fc0c06 100644
+--- a/libxslt/xsltInternals.h
++++ b/libxslt/xsltInternals.h
+@@ -1786,6 +1786,8 @@ struct _xsltTransformContext {
+ int maxTemplateVars;
+ unsigned long opLimit;
+ unsigned long opCount;
++
++ unsigned long nextid;/* for generating stable ids */
+ };
+
+ /**
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-30 17:54:52 UTC (rev 454782)
+++ PKGBUILD 2022-08-30 17:57:36 UTC (rev 454783)
@@ -1,82 +0,0 @@
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgbase=libxslt
-pkgname=(libxslt libxslt-docs)
-pkgver=1.1.37
-pkgrel=1
-pkgdesc="XML stylesheet transformation library"
-url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home"
-arch=(x86_64)
-license=(custom:MIT)
-depends=(
- libgcrypt
- libxml2
- xz
-)
-makedepends=(
- git
- python
-)
-checkdepends=(
- docbook-xml
-)
-options=(debug)
-_commit=5eca7fb65b7337409a02f9f94fde608edf7d1b0a # tags/v1.1.37^0
-source=("git+https://gitlab.gnome.org/GNOME/libxslt.git#commit=$_commit"
- 0001-Make-generate-id-deterministic.patch)
-sha256sums=('SKIP'
- '605e0a0b2ca385a90226bc5b141d3f6bfeade13e43ab39f8dea863505d7cbf18')
-
-pkgver() {
- cd libxslt
- git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd libxslt
-
- # Make xsltproc output reproducible for packages which use it to generate documentation
- git apply -3 ../0001-Make-generate-id-deterministic.patch
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd libxslt
-
- ./configure \
- --prefix=/usr \
- --with-python=/usr/bin/python \
- --disable-static
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
- make
-}
-
-check() {
- cd libxslt
- make check
-}
-
-package_libxslt() {
- optdepends=('python: Python bindings')
- provides=(lib{,e}xslt.so)
-
- cd libxslt
-
- make DESTDIR="$pkgdir" install
-
- mkdir -p ../doc/usr/share
- mv "$pkgdir"/usr/share/{doc,gtk-doc} -t ../doc/usr/share
-
- install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-package_libxslt-docs() {
- pkgdesc+=" (documentation)"
- depends=()
-
- mv doc/* "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: libxslt/repos/testing-x86_64/PKGBUILD (from rev 454782, libxslt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-30 17:57:36 UTC (rev 454783)
@@ -0,0 +1,87 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgbase=libxslt
+pkgname=(libxslt libxslt-docs)
+pkgver=1.1.37
+pkgrel=2
+pkgdesc="XML stylesheet transformation library"
+url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home"
+arch=(x86_64)
+license=(custom:MIT)
+depends=(
+ libgcrypt
+ libxml2
+ xz
+)
+makedepends=(
+ git
+ python
+)
+checkdepends=(
+ docbook-xml
+)
+options=(debug)
+_commit=5eca7fb65b7337409a02f9f94fde608edf7d1b0a # tags/v1.1.37^0
+source=("git+https://gitlab.gnome.org/GNOME/libxslt.git#commit=$_commit"
+ 0001-Make-generate-id-deterministic.patch)
+sha256sums=('SKIP'
+ '605e0a0b2ca385a90226bc5b141d3f6bfeade13e43ab39f8dea863505d7cbf18')
+
+pkgver() {
+ cd libxslt
+ git describe --tags | sed 's/-rc/rc/;s/^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd libxslt
+
+ # Make xsltproc output reproducible for packages which use it to generate documentation
+ git apply -3 ../0001-Make-generate-id-deterministic.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd libxslt
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-python=/usr/bin/python \
+ --disable-static
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd libxslt
+ make check
+}
+
+package_libxslt() {
+ optdepends=('python: Python bindings')
+ provides=(lib{,e}xslt.so)
+
+ cd libxslt
+
+ make DESTDIR="$pkgdir" install
+
+ mkdir -p ../doc/usr/share
+ mv "$pkgdir"/usr/share/{doc,gtk-doc} -t ../doc/usr/share
+
+ install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_libxslt-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+
+ mv doc/* "$pkgdir"
+
+ install -Dm644 libxslt/Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim:set sw=2 sts=-1 et:
More information about the arch-commits
mailing list