[SCM] hydrogen/master: Remove 1006_werror_format_security.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Jan 27 01:51:02 UTC 2012


The following commit has been merged in the master branch:
commit b1b5e54bfae56616b724ebd9e50378e944882ac5
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 27 02:49:46 2012 +0100

    Remove 1006_werror_format_security.patch, applied upstream.

diff --git a/debian/patches/1006_werror_format_security.patch b/debian/patches/1006_werror_format_security.patch
deleted file mode 100644
index 65c877f..0000000
--- a/debian/patches/1006_werror_format_security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Matthias Klose <doko at ubuntu.com>
-Description: Prevent FTBFS with -Werror=format-security enabled.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643406
-Forwarded: no
----
- libs/hydrogen/src/object.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- hydrogen.orig/libs/hydrogen/src/object.cpp
-+++ hydrogen/libs/hydrogen/src/object.cpp
-@@ -239,9 +239,9 @@ void* loggerThread_func( void* param )
- 		QString tmpString;
- 		for( it = last = queue.begin() ; it != queue.end() ; ++it ) {
- 			last = it;
--			printf( it->toLocal8Bit() );
-+			printf( "%s", it->toLocal8Bit().constData() );
- 			if( pLogFile ) {
--				fprintf( pLogFile, it->toLocal8Bit() );
-+				fprintf( pLogFile, "%s", it->toLocal8Bit().constData() );
- 				fflush( pLogFile );
- 			}
- 		}
diff --git a/debian/patches/series b/debian/patches/series
index 5f1064c..e588772 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 09_portaudio_v2.patch
 1001_rubberband_path.patch
 1005_name_shouldnt_repeat_genericname.patch
-1006_werror_format_security.patch
 1007_installation_error_fix.patch

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list