retitle 548965 levee: [PATCH] fails to build with gcc-4.4/newer eglibc
tags 548965 + patch
thanks
Hi Felipe,
Here are the NMU fixes for the FTBFS bug opened 2009-09-12.
Changes:
levee (3.5a-1.1) unstable; urgency=low
.
[Jari Aalto]
* Non-maintainer upload.
* Move to packaging format "3.0 (quilt)" due to patch.
* debian/patches
- (Number 10): Add patch to fix Gcc 4.4 error: conflicting types
for getline (RC bug FTBFS serious; Closes: #548965).
# lsdiff levee-3.5a-1.1-nmu.diff
a/debian/changelog
b/debian/patches/10-gcc4.4-getline.patch
b/debian/patches/series
b/debian/source/format
debian/changelog | 11 +++
debian/patches/10-gcc4.4-getline.patch | 105 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/source/format | 1 +
4 files changed, 118 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5137d4b..3b2c5db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+levee (3.5a-1.1) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * Move to packaging format "3.0 (quilt)" due to patch.
+ * debian/patches
+ - (Number 10): Add patch to fix Gcc 4.4 error: conflicting types
+ for getline (RC bug FTBFS serious; Closes: #548965).
+
+ -- Jari Aalto <[email protected]> Sun, 14 Feb 2010 16:48:08 +0200
+
levee (3.5a-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/10-gcc4.4-getline.patch b/debian/patches/10-gcc4.4-getline.patch
new file mode 100644
index 0000000..252fcb3
--- /dev/null
+++ b/debian/patches/10-gcc4.4-getline.patch
@@ -0,0 +1,105 @@
+From 789d4a04a02f48e1db228b92fffb29c54780a909 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <[email protected]>
+Date: Sun, 14 Feb 2010 17:20:44 +0200
+Subject: [PATCH] Fix Gcc 4.4 getline
+
+Signed-off-by: Jari Aalto <[email protected]>
+---
+ editcor.c | 2 +-
+ extern.h | 2 +-
+ main.c | 2 +-
+ misc.c | 4 ++--
+ move.c | 2 +-
+ proto.h | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/editcor.c b/editcor.c
+index 35aa626..4dae9e3 100644
+--- a/editcor.c
++++ b/editcor.c
+@@ -186,7 +186,7 @@ execute(start, end)
+
+ clrprompt();
+ printch('!');
+- if ( !getline(instring) )
++ if ( !levee_getline(instring) )
+ return FALSE;
+
+ if ( (tf = mkstemp(scratch)) < 0 ) {
+diff --git a/extern.h b/extern.h
+index 0e505b1..1484282 100644
+--- a/extern.h
++++ b/extern.h
+@@ -197,7 +197,7 @@ extern exec_type PROC editcore();
+ extern char PROC line(), peekc(), readchar();
+ extern char PROC *findparse(),*makepat();
+
+-extern bool PROC getline();
++extern bool PROC levee_getline();
+ extern bool PROC putfile();
+ extern bool PROC doyank(), deletion(), putback();
+ extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo();
+diff --git a/main.c b/main.c
+index 6e4b3d6..fe4113c 100644
+--- a/main.c
++++ b/main.c
+@@ -253,7 +253,7 @@ exec_type emode;
+ mode=emode;
+ do {
+ prompt(FALSE,":");
+- if (getline(instring))
++ if (levee_getline(instring))
+ exec(instring, &mode, &noquit);
+ indirect = FALSE;
+ if (mode == E_VISUAL && zotscreen && noquit) { /*ask for more*/
+diff --git a/misc.c b/misc.c
+index 48197d2..329d58d 100644
+--- a/misc.c
++++ b/misc.c
+@@ -21,7 +21,7 @@
+ #include "extern.h"
+
+ bool PROC
+-getline(str)
++levee_getline(str)
+ char *str;
+ {
+ int len;
+@@ -31,7 +31,7 @@ char *str;
+ str[len] = 0;
+ strput(CE);
+ return (flag == EOL);
+-} /* getline */
++} /* levee_getline */
+
+
+ char PROC
+diff --git a/move.c b/move.c
+index ecc1eee..a396263 100644
+--- a/move.c
++++ b/move.c
+@@ -160,7 +160,7 @@ cmdtype cmd;
+ clrprompt();
+ if (cmd == PATT_FWD || cmd == PATT_BACK) {
+ printch(tsearch = instring[0] = chars[cmd-PATT_FWD]);
+- if (!getline(&instring[1]))
++ if (!levee_getline(&instring[1]))
+ return ESCAPED; /* needs to skip later tests */
+ }
+ else {
+diff --git a/proto.h b/proto.h
+index c362af3..e65be5d 100644
+--- a/proto.h
++++ b/proto.h
+@@ -71,7 +71,7 @@ int PROC fseekeol(int origin);
+ int PROC gcount(void);
+ int PROC getKey(void);
+ int PROC getcontext(char c,int begline);
+-int PROC getline(char *str);
++int PROC levee_getline(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);
+--
+1.6.6.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..af573a3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-gcc4.4-getline.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
