added my Recipes
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 18 Jan 2023 14:50:08 -0800
|
||||
Subject: [PATCH] Fix hash_key_put() signature
|
||||
|
||||
Fixes
|
||||
|
||||
../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types]
|
||||
xmlHashScan(uniq, hash_key_put, &lines);
|
||||
^~~~~~~~~~~~
|
||||
|
||||
Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/xml_elem.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/xml_elem.c b/src/xml_elem.c
|
||||
index 024e62a..a73038a 100644
|
||||
--- a/src/xml_elem.c
|
||||
+++ b/src/xml_elem.c
|
||||
@@ -186,7 +186,7 @@ typedef struct {
|
||||
* put @name into @data->array[@data->offset]
|
||||
*/
|
||||
static void
|
||||
-hash_key_put(void *payload, void *data, xmlChar *name)
|
||||
+hash_key_put(void *payload, void *data, const xmlChar *name)
|
||||
{
|
||||
ArrayDest *dest = data;
|
||||
dest->array[dest->offset++] = name;
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
Upstream-Status: Submitted [sourceforge]
|
||||
|
||||
From 75d789d0ea9716c9a9ae72f42a2fcfa907cf4a12 Mon Sep 17 00:00:00 2001
|
||||
From: Matthieu Crapet <mcrapet@gmail.com>
|
||||
Date: Mon, 30 Jun 2014 13:52:25 +0200
|
||||
Subject: [PATCH] usage2c.awk: fix wrong basename regexp
|
||||
|
||||
Previously not matching with filename argument with absolute path.
|
||||
|
||||
Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
|
||||
---
|
||||
usage2c.awk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/usage2c.awk b/usage2c.awk
|
||||
index 94b897a..9aea212 100755
|
||||
--- a/usage2c.awk
|
||||
+++ b/usage2c.awk
|
||||
@@ -6,13 +6,13 @@ BEGIN {
|
||||
}
|
||||
|
||||
# text in src/foo-bar.txt results in
|
||||
-# static const char foo_text[] = {
|
||||
+# static const char foo_bar[] = {
|
||||
# 't', 'h', 'e', ' ', 't', 'e', 'x', 't', ...
|
||||
# }
|
||||
length(command_name) == 0 {
|
||||
command_name = FILENAME;
|
||||
sub(/\.txt$/, "", command_name);
|
||||
- sub(/^([^\/]+\/)*/, "", command_name);
|
||||
+ sub(/^.*\//, "", command_name);
|
||||
gsub(/-/, "_", command_name);
|
||||
printf("static const char %s[] = {\n", command_name);
|
||||
progs = 0;
|
||||
--
|
||||
2.0.0
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure
|
||||
|
||||
Same behavior for xslt-config.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ed04e0c..39d5d4c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -40,7 +40,8 @@ AC_ARG_PROGRAM dnl Transforming Program Names When Installing
|
||||
AC_PROG_SED
|
||||
AC_PROG_AWK
|
||||
|
||||
-XSTAR_LIB_CHECK([LIBXML], [xml2-config])
|
||||
+AS_IF([test "x$LIBXML_PREFIX" = x],
|
||||
+ [XSTAR_LIB_CHECK([LIBXML], [xml2-config])])
|
||||
|
||||
AS_IF([test "x$LIBXML_SRCDIR" != x],
|
||||
[LIBXML_INCDIR="$LIBXML_SRCDIR/include"])
|
||||
@@ -56,7 +57,8 @@ AS_IF([test "x$STATIC_LIBS" != xno],
|
||||
[LIBXML_LDFLAGS="-L$LIBXML_LIBDIR"]
|
||||
|
||||
|
||||
-XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])
|
||||
+AS_IF([test "x$LIBXSLT_PREFIX" = x],
|
||||
+ [XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])])
|
||||
|
||||
AS_IF([test "x$LIBXSLT_SRCDIR" != x],
|
||||
[XSLTPROC_PATH="$LIBXSLT_SRCDIR/xsltproc:$PATH"
|
||||
Reference in New Issue
Block a user