Package: levee
Version: 3.5a-1
Severity: normal
Tags: patch
Hi,
thanks for maintaining levee.
During Ubuntu's rebuild test, levee failed to build with gcc-4.4/newer eglibc
[1]. The reason is that the new eglibc nowadays defines getline.
Attached is a patch that renames the getline definition to getline_levee.
Cheers,
Stefan.
[1]:
<http://launchpadlibrarian.net/31818191/buildlog_ubuntu-karmic-amd64.levee_3.5a-1_FAILEDTOBUILD.txt.gz>
-- System Information:
Debian Release: squeeze/sid
APT prefers karmic-updates
APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.31-10-generic (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- levee-3.5a.orig/editcor.c
+++ levee-3.5a/editcor.c
@@ -186,7 +186,7 @@
clrprompt();
printch('!');
- if ( !getline(instring) )
+ if ( !getline_levee(instring) )
return FALSE;
if ( (tf = mkstemp(scratch)) < 0 ) {
only in patch2:
unchanged:
--- levee-3.5a.orig/extern.h
+++ levee-3.5a/extern.h
@@ -197,7 +197,7 @@
extern char PROC line(), peekc(), readchar();
extern char PROC *findparse(),*makepat();
-extern bool PROC getline();
+extern bool PROC getline_levee();
extern bool PROC putfile();
extern bool PROC doyank(), deletion(), putback();
extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo();
only in patch2:
unchanged:
--- levee-3.5a.orig/main.c
+++ levee-3.5a/main.c
@@ -253,7 +253,7 @@
mode=emode;
do {
prompt(FALSE,":");
- if (getline(instring))
+ if (getline_levee(instring))
exec(instring, &mode, &noquit);
indirect = FALSE;
if (mode == E_VISUAL && zotscreen && noquit) { /*ask for more*/
only in patch2:
unchanged:
--- levee-3.5a.orig/misc.c
+++ levee-3.5a/misc.c
@@ -21,7 +21,7 @@
#include "extern.h"
bool PROC
-getline(str)
+getline_levee(str)
char *str;
{
int len;
only in patch2:
unchanged:
--- levee-3.5a.orig/move.c
+++ levee-3.5a/move.c
@@ -160,7 +160,7 @@
clrprompt();
if (cmd == PATT_FWD || cmd == PATT_BACK) {
printch(tsearch = instring[0] = chars[cmd-PATT_FWD]);
- if (!getline(&instring[1]))
+ if (!getline_levee(&instring[1]))
return ESCAPED; /* needs to skip later tests */
}
else {
only in patch2:
unchanged:
--- levee-3.5a.orig/proto.h
+++ levee-3.5a/proto.h
@@ -71,7 +71,7 @@
int PROC gcount(void);
int PROC getKey(void);
int PROC getcontext(char c,int begline);
-int PROC getline(char *str);
+int PROC getline_levee(char *str);
int PROC initialize(int count,char * *args);
int PROC inputf(char *fname,int newbuf);
int PROC insert_to_undo(struct undostack *u,int start,int size);
