Bug#625379: libpri: ftbfs with gcc-4.6 -Werror

[Aurelien Jarno]

On Tue, May 03, 2011 at 10:33:37AM +0000, Matthias Klose wrote:
> Package: libpri
> Version: 1.4.11.3-1
> Severity: important
> Tags: wheezy sid
> User: debian-gcc at lists.debian.org
> Usertags: ftbfs-gcc-4.6 ftbfs-werror
> 
> This package builds with -Werror, and GCC 4.6 triggers new warnings
> which will make the package fail to build.  Currently a Debian patch
> just passes
>     -Wno-error=unused-but-set-variable and
>     -Wno-error=unused-but-set-parameter
> to avoid build failures, but this patch will be reverted with the
> GCC 4.6.1 release, and the severity of the report will be raised.
> 
> The full build log can be found at:
> http://people.debian.org/~doko/tmp/werror/libpri_1.4.11.3-1_lsid64.buildlog
> The last lines of the build log are at the end of this report.
> 

I have just done an NMU to fix this longstanding issue. Please find the
corresponding patch below:

diff -Nru libpri-1.4.11.3/debian/changelog libpri-1.4.11.3/debian/changelog
--- libpri-1.4.11.3/debian/changelog	2010-07-06 09:48:50.000000000 +0200
+++ libpri-1.4.11.3/debian/changelog	2011-09-09 14:57:53.000000000 +0200
@@ -1,3 +1,10 @@
+libpri (1.4.11.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add gcc-4.6-werror to fix FTBFS with gcc-4.6.  Closes: #625379.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 09 Sep 2011 14:54:45 +0200
+
 libpri (1.4.11.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
diff -Nru libpri-1.4.11.3/debian/patches/gcc-4.6-werror libpri-1.4.11.3/debian/patches/gcc-4.6-werror
--- libpri-1.4.11.3/debian/patches/gcc-4.6-werror	1970-01-01 01:00:00.000000000 +0100
+++ libpri-1.4.11.3/debian/patches/gcc-4.6-werror	2011-09-09 14:57:24.000000000 +0200
@@ -0,0 +1,15 @@
+Remove unused variable
+
+--- libpri-1.4.11.3.orig/q921.c
++++ libpri-1.4.11.3/q921.c
+@@ -808,10 +808,8 @@ void q921_dump(struct pri *pri, q921_h *
+ 
+ 	if ((h->u.ft == 3) && (h->u.m3 == 0) && (h->u.m2 == 0) && (h->u.data[0] == 0x0f)) {
+ 		int ri;
+-		int tei;
+ 
+ 		ri = (h->u.data[1] << 8) | h->u.data[2];
+-		tei = (h->u.data[4] >> 1);
+ 		/* TEI assignment related */
+ 		switch (h->u.data[3]) {
+ 		case Q921_TEI_IDENTITY_REQUEST:
diff -Nru libpri-1.4.11.3/debian/patches/series libpri-1.4.11.3/debian/patches/series
--- libpri-1.4.11.3/debian/patches/series	2010-07-06 09:43:55.000000000 +0200
+++ libpri-1.4.11.3/debian/patches/series	2011-09-09 14:57:04.000000000 +0200
@@ -1 +1,2 @@
 enable-gcc-optimizations
+gcc-4.6-werror

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien at aurel32.net                 http://www.aurel32.net