Control: tags 811789 + patch Dear maintainer,
I've prepared an NMU for zvbi (versioned as 0.2.35-10.1). The diff is attached to this message. Regards.
diff -Nru zvbi-0.2.35/debian/changelog zvbi-0.2.35/debian/changelog
--- zvbi-0.2.35/debian/changelog 2015-11-28 21:08:40.000000000 -0500
+++ zvbi-0.2.35/debian/changelog 2016-07-17 20:47:46.000000000 -0400
@@ -1,3 +1,13 @@
+zvbi (0.2.35-10.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 6. The test code is using values that overflow the
+ variable types. I just replaced the values with a saner value
+ (double checked that it didn't change when compiling with GCC5 and
+ GCC6 with this fix). (Closes: #811789)
+
+ -- Breno Leitao <bren...@br.ibm.com> Sun, 17 Jul 2016 18:02:37 -0400
+
zvbi (0.2.35-10) unstable; urgency=medium
* Migrations:
diff -Nru zvbi-0.2.35/debian/patches/09_FTBFS_gcc6.patch zvbi-0.2.35/debian/patches/09_FTBFS_gcc6.patch
--- zvbi-0.2.35/debian/patches/09_FTBFS_gcc6.patch 1969-12-31 19:00:00.000000000 -0500
+++ zvbi-0.2.35/debian/patches/09_FTBFS_gcc6.patch 2016-07-17 20:47:31.000000000 -0400
@@ -0,0 +1,29 @@
+--- zvbi-0.2.35.orig/test/test-dvb_mux.cc
++++ zvbi-0.2.35/test/test-dvb_mux.cc
+@@ -137,7 +137,7 @@ is_good_service (vbi_service_set servi
+ static const vbi_service_set
+ all_services [] = {
+ 0,
+- -1,
++ UINT_MAX,
+ VBI_SLICED_2xCAPTION_525,
+ VBI_SLICED_CAPTION_525,
+ VBI_SLICED_CAPTION_525_F1,
+@@ -1279,7 +1279,7 @@ test_multiplex_sliced_service_checks
+
+ /* Verify the service filter. */
+
+- if (-1u == service
++ if (UINT_MAX == service
+ || (VBI_SLICED_TELETEXT_B_625
+ == (VBI_SLICED_TELETEXT_B_625 & service))) {
+ assert_multiplex_sliced (buffer, buffer_size,
+@@ -3237,7 +3237,7 @@ static void
+ test_dvb_mux_cor_pts (void)
+ {
+ static const int64_t ptss [] = {
+- 0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll,
++ 0, -1, 0, 0x7FFFFFFFFFFFFFFFll,
+ };
+ DVBPESMuxTest mx;
+ unsigned int i;
diff -Nru zvbi-0.2.35/debian/patches/series zvbi-0.2.35/debian/patches/series
--- zvbi-0.2.35/debian/patches/series 2015-11-28 20:50:05.000000000 -0500
+++ zvbi-0.2.35/debian/patches/series 2016-07-17 20:47:39.000000000 -0400
@@ -5,3 +5,4 @@
06_sizeof_FTBFS.patch
07_fix-spelling-in-binaries.patch
08_fix-manpage.patch
+09_FTBFS_gcc6.patch
signature.asc
Description: PGP signature
