Bug#777832: devil: ftbfs with GCC-5
Control: tags -1 patch
Hi,
please find attached a patch for this issue.
Regards,
Markus
diff -Nru devil-1.7.8/debian/changelog devil-1.7.8/debian/changelog
--- devil-1.7.8/debian/changelog2014-08-20 21:34:04.0 +0200
+++ devil-1.7.8/debian/changelog2015-07-07 01:55:31.0 +0200
@@ -1,3 +1,11 @@
+devil (1.7.8-10) unstable; urgency=medium
+
+ * QA upload.
+ * Add GCC-5-FTBFS-il.h.patch and fix build error with GCC-5.
+ * Declare compliance with Debian Policy 3.9.6.
+
+ -- Markus Koschany a...@gambaru.de Tue, 07 Jul 2015 01:54:18 +0200
+
devil (1.7.8-9) unstable; urgency=medium
* QA upload.
diff -Nru devil-1.7.8/debian/control devil-1.7.8/debian/control
--- devil-1.7.8/debian/control 2014-06-02 20:28:23.0 +0200
+++ devil-1.7.8/debian/control 2015-07-07 01:55:09.0 +0200
@@ -15,7 +15,7 @@
libsdl1.2-dev,
libtiff-dev,
zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://openil.sourceforge.net/
Package: libdevil1c2
diff -Nru devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch
devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch
--- devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch 1970-01-01
01:00:00.0 +0100
+++ devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch 2015-07-07
01:54:07.0 +0200
@@ -0,0 +1,26 @@
+From: Markus Koschany a...@gambaru.de
+Date: Tue, 7 Jul 2015 01:49:26 +0200
+Subject: GCC-5 FTBFS il.h
+
+Fix FTBFS with GCC-5. Thanks to NetBSD
+http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/devIL/patches/patch-include_IL_il.h
+
+Bug: https://bugs.debian.org/777832
+Forwarded: no
+---
+ include/IL/il.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/IL/il.h b/include/IL/il.h
+index 540a56e..21fd6b2 100644
+--- a/include/IL/il.h
b/include/IL/il.h
+@@ -63,7 +63,7 @@ extern C {
+ #endif
+ #endif
+
+-#ifdef RESTRICT_KEYWORD
++#if defined(RESTRICT_KEYWORD) !defined(__cplusplus)
+ #define RESTRICT restrict
+ #define CONST_RESTRICT const restrict
+ #else
diff -Nru devil-1.7.8/debian/patches/series devil-1.7.8/debian/patches/series
--- devil-1.7.8/debian/patches/series 2014-08-20 21:34:04.0 +0200
+++ devil-1.7.8/debian/patches/series 2015-07-07 01:52:00.0 +0200
@@ -3,3 +3,4 @@
03_CVE-2009-3994.diff
04_png_set_expand_gray.diff
lcms2.patch
+GCC-5-FTBFS-il.h.patch
signature.asc
Description: OpenPGP digital signature
Bug#777832: devil: ftbfs with GCC-5
Package: src:devil Version: 1.7.8-9 Severity: normal Tags: sid stretch User: debian-...@lists.debian.org Usertags: ftbfs-gcc-5 Please keep this issue open in the bug tracker for the package it was filed for. If a fix in another package is required, please file a bug for the other package (or clone), and add a block in this package. Please keep the issue open until the package can be built in a follow-up test rebuild. The package fails to build in a test rebuild on at least amd64 with gcc-5/g++-5, but succeeds to build with gcc-4.9/g++-4.9. The severity of this report may be raised before the stretch release. The full build log can be found at: http://people.debian.org/~doko/logs/gcc5-20150205/devil_1.7.8-9_unstable_gcc5.log The last lines of the build log are at the end of this report. To build with GCC 5, either set CC=gcc-5 CXX=g++-5 explicitly, or install the gcc, g++, gfortran, ... packages from experimental. apt-get -t experimental install g++ Common build failures are C11 as the default C mode, new warnings resulting in build failures with -Werror turned on, or new/dropped symbols in Debian symbols files. For other C/C++ related build failures see the porting guide at http://gcc.gnu.org/gcc-5/porting_to.html [...] /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_alloc.lo `test -f './../src-IL/src/il_alloc.c' || echo './'`./../src-IL/src/il_alloc.c /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_doom.lo `test -f './../src-IL/src/il_doom.c' || echo './'`./../src-IL/src/il_doom.c /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_stack.lo `test -f './../src-IL/src/il_stack.c' || echo './'`./../src-IL/src/il_stack.c /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_pcx.lo `test -f './../src-IL/src/il_pcx.c' || echo './'`./../src-IL/src/il_pcx.c /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_rle.lo `test -f './../src-IL/src/il_rle.c' || echo './'`./../src-IL/src/il_rle.c /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_bits.lo `test -f './../src-IL/src/il_bits.c' || echo './'`./../src-IL/src/il_bits.c /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_endian.lo `test -f './../src-IL/src/il_endian.c' || echo './'`./../src-IL/src/il_endian.c /bin/bash ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_exr.lo `test -f './../src-IL/src/il_exr.cpp' || echo './'`./../src-IL/src/il_exr.cpp /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_jpeg.lo `test -f './../src-IL/src/il_jpeg.c' || echo './'`./../src-IL/src/il_jpeg.c /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -D_FORTIFY_SOURCE=2 -std=gnu99 -fgnu89-inline -msse -msse2 -msse3 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o libIL_la-il_pic.lo `test -f './../src-IL/src/il_pic.c' || echo './'`./../src-IL/src/il_pic.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../include/IL -I
