[SCM] composite/master: Add patch to fix FTBFS with gcc-6.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Jul 13 02:13:17 UTC 2016


The following commit has been merged in the master branch:
commit f84045f9e686e8aca2d57dd506b0c7cb815976df
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jul 12 21:05:26 2016 +0200

    Add patch to fix FTBFS with gcc-6.

diff --git a/debian/patches/02-gcc-6.patch b/debian/patches/02-gcc-6.patch
new file mode 100644
index 0000000..b0e2a31
--- /dev/null
+++ b/debian/patches/02-gcc-6.patch
@@ -0,0 +1,17 @@
+Description: Fix build with gcc-6.
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: composite/src/Tritium/src/LocalFileMng.cpp
+===================================================================
+--- composite.orig/src/Tritium/src/LocalFileMng.cpp
++++ composite/src/Tritium/src/LocalFileMng.cpp
+@@ -733,7 +733,7 @@ namespace Tritium
+ 
+         std::string playlistInfoFile = patternname;
+         std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary );
+-        if ( verify == NULL ) {
++        if ( verify.fail() ) {
+             //ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." );
+             return NULL;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 85166ca..6230d41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-spelling_errors.patch
+02-gcc-6.patch

-- 
composite packaging



More information about the pkg-multimedia-commits mailing list