Control: tags 808482 + patch Control: tags 808482 + pending Dear maintainer,
I've prepared an NMU for deborphan (versioned as 1.7.28.8-0.3) and am about to upload it. You'll find the NMU diff attached (and in dgit, if I can get it to work). Cheers, Julien
diff -Nru deborphan-1.7.28.8/debian/changelog deborphan-1.7.28.8/debian/changelog
--- deborphan-1.7.28.8/debian/changelog 2015-07-18 17:18:59.000000000 +0100
+++ deborphan-1.7.28.8/debian/changelog 2016-02-21 14:29:06.000000000 +0000
@@ -1,3 +1,12 @@
+deborphan (1.7.28.8-0.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC-5 harder. It makes no sense to declare functions
+ "inline" and then not provide a definition for them. Closes: #808482.
+ * Remove duplicate strsep definition from deborphan.h.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 21 Feb 2016 14:28:56 +0000
+
deborphan (1.7.28.8-0.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru deborphan-1.7.28.8/include/deborphan.h deborphan-1.7.28.8/include/deborphan.h
--- deborphan-1.7.28.8/include/deborphan.h 2015-07-18 17:18:22.000000000 +0100
+++ deborphan-1.7.28.8/include/deborphan.h 2016-02-21 14:24:09.000000000 +0000
@@ -30,15 +30,6 @@
# define KEEPER_FILE "/var/lib/deborphan/keep"
#endif
-/* strsep, ftruncate, and fileno, are the only remaining functions that
- * are not ANSI-compliant, afaik. These #ifdef's will help compilation
- * with -ansi -pedantic -Wall, but not linking. ftruncate, and fileno
- * are not needed anymore and these #ifdefs broke splint, thus removed.
- */
-#ifndef _BSD_SOURCE
-extern char *strsep(char **, const char *);
-#endif
-
#ifndef HAVE_ERRNO_H
# define errno 0
#endif
@@ -172,8 +163,8 @@
int string_to_priority(const char *priority);
const char *priority_to_string(int priority);
char *sstrsep(char **str, int c);
-extern inline void strstripchr(char *s, int c);
-extern inline unsigned int strhash(const char *line);
+void strstripchr(char *s, int c);
+unsigned int strhash(const char *line);
/* keep.c */
dep *readkeep(const char *kfile);
diff -Nru deborphan-1.7.28.8/include/xalloc.h deborphan-1.7.28.8/include/xalloc.h
--- deborphan-1.7.28.8/include/xalloc.h 2015-07-18 17:18:22.000000000 +0100
+++ deborphan-1.7.28.8/include/xalloc.h 2016-02-21 14:10:24.000000000 +0000
@@ -7,7 +7,7 @@
Distributed under the terms of the Artistic License.
*/
-extern inline void *xcalloc(size_t nmemb, size_t size);
-extern inline void *xmalloc(size_t size);
-extern inline void *xrealloc(void *ptr, size_t size);
-extern inline char *xstrdup(const char *s);
+void *xcalloc(size_t nmemb, size_t size);
+void *xmalloc(size_t size);
+void *xrealloc(void *ptr, size_t size);
+char *xstrdup(const char *s);
diff -Nru deborphan-1.7.28.8/src/string.c deborphan-1.7.28.8/src/string.c
--- deborphan-1.7.28.8/src/string.c 2012-06-30 19:47:50.000000000 +0100
+++ deborphan-1.7.28.8/src/string.c 2016-02-21 14:10:11.000000000 +0000
@@ -13,7 +13,7 @@
/* Simple function to hash a string to an unsigned int.
*/
-inline unsigned int
+unsigned int
strhash(const char *line)
{
unsigned int r = 0;
@@ -30,7 +30,7 @@
/* This function removes all occurences of the character 'c' from the
string 's'.
*/
-inline void
+void
strstripchr(char *s, int c)
{
register char *t;
diff -Nru deborphan-1.7.28.8/src/xalloc.c deborphan-1.7.28.8/src/xalloc.c
--- deborphan-1.7.28.8/src/xalloc.c 2012-06-30 19:47:50.000000000 +0100
+++ deborphan-1.7.28.8/src/xalloc.c 2016-02-21 14:10:54.000000000 +0000
@@ -35,7 +35,7 @@
# define EXIT_FAILURE 1
#endif /* STDC_HEADERS */
-inline void *
+void *
xrealloc(void *ptr, size_t size)
{
void *t;
@@ -44,7 +44,7 @@
return t;
}
-inline void *
+void *
xcalloc(size_t nmemb, size_t size)
{
void *t;
@@ -55,7 +55,7 @@
return t;
}
-inline void *
+void *
xmalloc(size_t size)
{
void *t;
@@ -66,7 +66,7 @@
return t;
}
-inline char *
+char *
xstrdup(const char *s)
{
char *t;
signature.asc
Description: PGP signature
