[xml/sgml-pkgs] Bug#741839: readline update

Mathieu Malaterre malat at debian.org
Wed Apr 9 12:44:32 UTC 2014


Control: tags -1 patch

I've modified the original patch to handle *all* `Function` within the
code using:

Index: refdb-1.0.2/src/readln.h
===================================================================
--- refdb-1.0.2.orig/src/readln.h 2014-04-09 12:37:12.876307005 +0000
+++ refdb-1.0.2/src/readln.h 2014-04-09 12:37:12.876307005 +0000
@@ -22,6 +22,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>

+typedef rl_icpfunc_t Function;
 typedef struct {
   char *name; /* User printable name of the function. */
   Function *func; /* Function to call to do the job. */


However it now fails with:

gcc -DPACKAGE_NAME=\"refdb\" -DPACKAGE_TARNAME=\"refdb\"
-DPACKAGE_VERSION=\"1.0.2\" -DPACKAGE_STRING=\"refdb\ 1.0.2\"
-DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"refdb\"
-DVERSION=\"1.0.2\" -D_GNU_SOURCE=1 -DREADLINE42=1 -DHAVE_ICONV=1
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1
-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1
-DHAVE_UNISTD_H=1 -DHAVE_SOCKLEN_T=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1
-DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_TIME_H=1
-DHAVE_SYS_IOCTL_H=1 -DHAVE_SYSLOG_H=1 -DHAVE_UNISTD_H=1
-DTIME_WITH_SYS_TIME=1 -DRETSIGTYPE=void -DHAVE_STRFTIME=1
-DHAVE_MKFIFO=1 -DHAVE_GETHOSTNAME=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1
-DHAVE_STRCSPN=1 -DHAVE_STRSTR=1 -DHAVE_STRTOLL=1 -DHAVE_ATOLL=1 -I.
-DSYSCONFDIR=\"/etc/refdb\" -DULLSPEC=\"%llu\" -D_FORTIFY_SOURCE=2  -g
-O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Werror=format-security -O2 -c -o page.o page.c
gcc  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Werror=format-security -O2  -Wl,-z,relro -o refdbib refdbib.o
getopt.o strfncs.o pref.o refdb-client.o connect.o page.o tokenize.o
readris.o linklist.o enigma.o cgi.o atoll.o passwd.o svn_version.o
gcc -DPACKAGE_NAME=\"refdb\" -DPACKAGE_TARNAME=\"refdb\"
-DPACKAGE_VERSION=\"1.0.2\" -DPACKAGE_STRING=\"refdb\ 1.0.2\"
-DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"refdb\"
-DVERSION=\"1.0.2\" -D_GNU_SOURCE=1 -DREADLINE42=1 -DHAVE_ICONV=1
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1
-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1
-DHAVE_UNISTD_H=1 -DHAVE_SOCKLEN_T=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1
-DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_TIME_H=1
-DHAVE_SYS_IOCTL_H=1 -DHAVE_SYSLOG_H=1 -DHAVE_UNISTD_H=1
-DTIME_WITH_SYS_TIME=1 -DRETSIGTYPE=void -DHAVE_STRFTIME=1
-DHAVE_MKFIFO=1 -DHAVE_GETHOSTNAME=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1
-DHAVE_STRCSPN=1 -DHAVE_STRSTR=1 -DHAVE_STRTOLL=1 -DHAVE_ATOLL=1 -I.
-DSYSCONFDIR=\"/etc/refdb\" -DULLSPEC=\"%llu\" -D_FORTIFY_SOURCE=2  -g
-O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Werror=format-security -O2 -c -o refdbc.o refdbc.c
refdbc.c:175:1: error: unknown type name 'CPPFunction'
 CPPFunction* rl_attempted_completion_function; /* ptr to completer */
 ^
refdbc.c:175:14: error: conflicting types for 'rl_attempted_completion_function'
 CPPFunction* rl_attempted_completion_function; /* ptr to completer */



More information about the debian-xml-sgml-pkgs mailing list