summaryrefslogtreecommitdiff
path: root/textproc/libxslt
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2019-06-13 12:59:39 +0000
committerSteve Wills <swills@FreeBSD.org>2019-06-13 12:59:39 +0000
commit8a749f47120d134fabfc829d98c83135c3a823d9 (patch)
treeceb1bfc6952b6d0d7ed6bae8a19cf394c297280a /textproc/libxslt
parentAdd compiler:c11 to USES to fix build on GCC-based systems: (diff)
textproc/libxml2: Update to 2.9.9 [1]
While here, fix a bug in libxslt triggered by the libxml2 update PR: 235713 [1] PR: 238522 Exp-run by: antoine Reported by: kunda <chitty_cloud@me.com> [1] Reviewed by: kwm [1] [2] Obtained from: https://gitlab.gnome.org/GNOME/libxslt/commit/5b0965010abf274f7a3a1291d16dde34c167e8a7
Notes
Notes: svn path=/head/; revision=504090
Diffstat (limited to 'textproc/libxslt')
-rw-r--r--textproc/libxslt/Makefile2
-rw-r--r--textproc/libxslt/files/patch-libxslt-keys.c26
2 files changed, 27 insertions, 1 deletions
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 6fae9d37756c..92d28fb346af 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxslt
PORTVERSION= 1.1.32
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= textproc gnome
MASTER_SITES= http://xmlsoft.org/sources/ \
https://mirror.umd.edu/xbmc/build-deps/sources/
diff --git a/textproc/libxslt/files/patch-libxslt-keys.c b/textproc/libxslt/files/patch-libxslt-keys.c
new file mode 100644
index 000000000000..6f9cc9df82f4
--- /dev/null
+++ b/textproc/libxslt/files/patch-libxslt-keys.c
@@ -0,0 +1,26 @@
+--- libxslt/keys.c.orig 2017-12-02 03:58:51.000000000 -0500
++++ libxslt/keys.c 2019-06-12 08:38:40.214472000 -0400
+@@ -629,6 +629,7 @@ xsltInitCtxtKey(xsltTransformContextPtr ctxt, xsltDocu
+ xmlNodePtr oldContextNode;
+ xsltDocumentPtr oldDocInfo;
+ int oldXPPos, oldXPSize;
++ xmlNodePtr oldXPNode;
+ xmlDocPtr oldXPDoc;
+ int oldXPNsNr;
+ xmlNsPtr *oldXPNamespaces;
+@@ -667,6 +668,7 @@ fprintf(stderr, "xsltInitCtxtKey %s : %d\n", keyDef->n
+ oldDocInfo = ctxt->document;
+ oldContextNode = ctxt->node;
+
++ oldXPNode = xpctxt->node;
+ oldXPDoc = xpctxt->doc;
+ oldXPPos = xpctxt->proximityPosition;
+ oldXPSize = xpctxt->contextSize;
+@@ -865,6 +867,7 @@ error:
+ /*
+ * Restore context state.
+ */
++ xpctxt->node = oldXPNode;
+ xpctxt->doc = oldXPDoc;
+ xpctxt->nsNr = oldXPNsNr;
+ xpctxt->namespaces = oldXPNamespaces;