Control: tags 778159 + pending
Dear maintainer,
I've prepared an NMU for uswsusp (versioned as 1.0+20120915-6.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
--
.''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
: :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/
`. `' Member of VIBE!AT SPI, fellow of the Free Software Foundation Europe
`-
diff -Nru uswsusp-1.0+20120915/debian/changelog uswsusp-1.0+20120915/debian/changelog
--- uswsusp-1.0+20120915/debian/changelog 2014-10-21 13:33:48.0 +0200
+++ uswsusp-1.0+20120915/debian/changelog 2015-07-19 17:13:12.0 +0200
@@ -1,3 +1,12 @@
+uswsusp (1.0+20120915-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix ftbfs with GCC-5: add patch from Andrew James:
+use C99 inline semantics.
+(Closes: #778159)
+
+ -- gregor herrmann gre...@debian.org Sun, 19 Jul 2015 17:12:45 +0200
+
uswsusp (1.0+20120915-6) unstable; urgency=medium
* Updated debian/initramfs-tools/hooks/uswsusp to allow lines with trailing
diff -Nru uswsusp-1.0+20120915/debian/patches/12_gcc5-ftbfs_c99.diff uswsusp-1.0+20120915/debian/patches/12_gcc5-ftbfs_c99.diff
--- uswsusp-1.0+20120915/debian/patches/12_gcc5-ftbfs_c99.diff 1970-01-01 01:00:00.0 +0100
+++ uswsusp-1.0+20120915/debian/patches/12_gcc5-ftbfs_c99.diff 2015-07-19 17:10:47.0 +0200
@@ -0,0 +1,85 @@
+Description: Fixes for new inline semantics related to GCC 5
+GCC 5 defaults to C99. C99's extern inline is equivalent to C89's inline.
+.
+See Different semantics for inline functions,
+https://gcc.gnu.org/gcc-5/porting_to.html
+
+Author: Andrew James andrew.ja...@hp.com
+Bug-Debian: https://bugs.debian.org/778159
+Forwarded: no
+
+--- a/Makefile.am
b/Makefile.am
+@@ -70,7 +70,8 @@
+ -D_LARGEFILE64_SOURCE \
+ $(LZO_CFLAGS) \
+ $(LIBBLKID_LIBS_CFLAGS) \
+- $(LIBGCRYPT_CFLAGS)
++ $(LIBGCRYPT_CFLAGS) \
++ -std=gnu99
+
+ common_s2disk_libs=\
+ $(LZO_LIBS) \
+--- a/bootsplash.c
b/bootsplash.c
+@@ -93,7 +93,7 @@
+ }
+ }
+
+-inline int bootsplash_progress(int p)
++extern inline int bootsplash_progress(int p)
+ {
+ char buf[MAX_LINE_SIZE];
+
+--- a/loglevel.c
b/loglevel.c
+@@ -16,7 +16,7 @@
+ static FILE *printk_file;
+ static int proc_mounted = 0;
+
+-inline void open_printk(void)
++extern inline void open_printk(void)
+ {
+ struct stat stat_buf;
+ char *procname = /proc/sys/kernel/printk;
+@@ -32,7 +32,7 @@
+ printk_file = fopen(procname, r+);
+ }
+
+-inline int get_kernel_console_loglevel(void)
++extern inline int get_kernel_console_loglevel(void)
+ {
+ int level = -1;
+
+@@ -43,7 +43,7 @@
+ return level;
+ }
+
+-inline void set_kernel_console_loglevel(int level)
++extern inline void set_kernel_console_loglevel(int level)
+ {
+ if (printk_file) {
+ rewind(printk_file);
+@@ -53,7 +53,7 @@
+
+ }
+
+-inline void close_printk(void)
++extern inline void close_printk(void)
+ {
+ if (printk_file)
+ fclose(printk_file);
+--- a/loglevel.h
b/loglevel.h
+@@ -4,7 +4,7 @@
+ * (c) 2007 Tim Dijkstra
+ */
+
+-inline void open_printk(void);
+-inline int get_kernel_console_loglevel(void);
+-inline void set_kernel_console_loglevel(int level);
+-inline void close_printk(void);
++extern void open_printk(void);
++extern int get_kernel_console_loglevel(void);
++extern void set_kernel_console_loglevel(int level);
++extern void close_printk(void);
diff -Nru uswsusp-1.0+20120915/debian/patches/series uswsusp-1.0+20120915/debian/patches/series
--- uswsusp-1.0+20120915/debian/patches/series 2014-10-21 13:33:48.0 +0200
+++ uswsusp-1.0+20120915/debian/patches/series 2015-07-19 17:10:47.0 +0200
@@ -10,3 +10,4 @@
09_readme_new_options.patch
10_checksum_buffer_size.patch
11_disable_gcrypt.patch
+12_gcc5-ftbfs_c99.diff
signature.asc
Description: Digital Signature
