diff options
author | Roland Hieber <rhi@pengutronix.de> | 2019-03-03 19:32:35 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-04 12:47:02 +0100 |
commit | ca43b5ea940478e0d7a37cebff98f8ef23f3ea7b (patch) | |
tree | 6f6f1ff33bfc288f513a8c87065c56c17f08bd3a /patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch | |
parent | c6c7a1588b9195d33d4802af18187f9c754c6f95 (diff) | |
download | ptxdist-ca43b5ea940478e0d7a37cebff98f8ef23f3ea7b.tar.gz ptxdist-ca43b5ea940478e0d7a37cebff98f8ef23f3ea7b.tar.xz |
xmlstarlet: convert old patch series with git-ptx-patches
When using git-ptx-patches, it adds additional headers inserted by
default by git-format-patch. Get rid of this diff for future changes in
the patch series while still staying compatible with the quilt instead
of git-ptx-patches workflow.
The date headers were reverse-engineered from Git history, the
Applied-Upstream tags were added based on the patch tracking information
of the patches.
No functional changes.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch')
-rw-r--r-- | patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch b/patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch new file mode 100644 index 000000000..81c108f17 --- /dev/null +++ b/patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch @@ -0,0 +1,94 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Sun, 29 Nov 2009 00:00:00 +0100 +Subject: [PATCH] xmlstarlet: use debug functions only if libxml2 has debug + support + +We use xmlXPathDebugDumpCompExpr without testing if libxml2 has support +for it enabled. This can result in the following linker error: + +xml_edit.o: In function `edUpdate': +xmlstarlet-1.0.1/src/xml_edit.c:327: +undefined reference to `xmlXPathDebugDumpCompExpr' + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +Applied-Upstream: 1.0.2, commit:1cb3f329c92ee9aa9e1dc15c1f1e46a9fc31d4b8 +--- + src/xml_edit.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/src/xml_edit.c b/src/xml_edit.c +index 8e195304302a..42391a9bd569 100644 +--- a/src/xml_edit.c ++++ b/src/xml_edit.c +@@ -323,9 +323,10 @@ edUpdate(xmlDocPtr doc, const char *loc, const char *val, XmlNodeType type) + comp = xmlXPathCompile(BAD_CAST loc); + if (comp != NULL) + { ++#if defined(LIBXML_DEBUG_ENABLED) + if (tree) + xmlXPathDebugDumpCompExpr(stdout, comp, 0); +- ++#endif + res = xmlXPathCompiledEval(comp, ctxt); + xmlXPathFreeCompExpr(comp); + } +@@ -406,9 +407,10 @@ edInsert(xmlDocPtr doc, const char *loc, const char *val, const char *name, + comp = xmlXPathCompile(BAD_CAST loc); + if (comp != NULL) + { ++#if defined(LIBXML_DEBUG_ENABLED) + if (tree) + xmlXPathDebugDumpCompExpr(stdout, comp, 0); +- ++#endif + res = xmlXPathCompiledEval(comp, ctxt); + xmlXPathFreeCompExpr(comp); + } +@@ -508,9 +510,10 @@ edRename(xmlDocPtr doc, char *loc, char *val, XmlNodeType type) + comp = xmlXPathCompile(BAD_CAST loc); + if (comp != NULL) + { ++#if defined(LIBXML_DEBUG_ENABLED) + if (tree) + xmlXPathDebugDumpCompExpr(stdout, comp, 0); +- ++#endif + res = xmlXPathCompiledEval(comp, ctxt); + xmlXPathFreeCompExpr(comp); + } +@@ -599,9 +602,10 @@ edDelete(xmlDocPtr doc, char *str) + comp = xmlXPathCompile(BAD_CAST str); + if (comp != NULL) + { ++#if defined(LIBXML_DEBUG_ENABLED) + if (tree) + xmlXPathDebugDumpCompExpr(stdout, comp, 0); +- ++#endif + res = xmlXPathCompiledEval(comp, ctxt); + xmlXPathFreeCompExpr(comp); + } +@@ -691,9 +695,10 @@ edMove(xmlDocPtr doc, char *from, char *to) + comp = xmlXPathCompile(BAD_CAST from); + if (comp != NULL) + { ++#if defined(LIBXML_DEBUG_ENABLED) + if (tree) + xmlXPathDebugDumpCompExpr(stdout, comp, 0); +- ++#endif + res = xmlXPathCompiledEval(comp, ctxt); + xmlXPathFreeCompExpr(comp); + } +@@ -738,9 +743,10 @@ edMove(xmlDocPtr doc, char *from, char *to) + comp = xmlXPathCompile(BAD_CAST to); + if (comp != NULL) + { ++#if defined(LIBXML_DEBUG_ENABLED) + if (tree) + xmlXPathDebugDumpCompExpr(stdout, comp, 0); +- ++#endif + res_to = xmlXPathCompiledEval(comp, ctxt); + xmlXPathFreeCompExpr(comp); + } |