[yocto] [PATCH][meta-qt4] qwt: backport a patch from upstream to fix format string warnings

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 recipes-qt4/recipes-libs/qwt-6.0.1/warnings.patch | 89 +++++++++++++++++++++++
 recipes-qt4/recipes-libs/qwt.inc                  |  3 +-
 2 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt4/recipes-libs/qwt-6.0.1/warnings.patch

diff --git a/recipes-qt4/recipes-libs/qwt-6.0.1/warnings.patch b/recipes-qt4/recipes-libs/qwt-6.0.1/warnings.patch
new file mode 100644
index 0000000..865363a
--- /dev/null
+++ b/recipes-qt4/recipes-libs/qwt-6.0.1/warnings.patch
@@ -0,0 +1,89 @@
+Fix format string security warnings.
+
+Upstream-Status: Backport (r1502)
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+Index: qwt/textengines/mathml/qwt_mml_document.cpp
+===================================================================
+--- qwt/textengines/mathml/qwt_mml_document.cpp	(revision 1501)
++++ qwt/textengines/mathml/qwt_mml_document.cpp	(revision 1502)
+@@ -3,6 +3,7 @@
+ #include <QDesktopWidget>
+ #include <QPainter>
+ #include <QDomNode>
++#include <QDebug>
+ 
+ #include "qwt_mml_document.h"
+ 
+@@ -3122,7 +3123,7 @@
+ {
+     if ( node == 0 ) return;
+ 
+-    qWarning( ( indent + node->toStr() ).toLatin1().data() );
++    qWarning() << indent + node->toStr();
+ 
+     indent += "  ";
+     const QwtMmlNode *child = node->firstChild();
+@@ -3702,7 +3703,7 @@
+         }
+         else
+         {
+-            qWarning( ( "QwtMmlNode::scriptlevel(): bad value " + expl_sl_str ).toLatin1().data() );
++            qWarning() << "QwtMmlNode::scriptlevel(): bad value " + expl_sl_str;
+             return parent_sl;
+         }
+     }
+@@ -3719,7 +3720,7 @@
+         return parent_sl - 1;
+     else
+     {
+-        qWarning( ( "QwtMmlNode::scriptlevel(): could not parse value: \"" + expl_sl_str + "\"" ).toLatin1().data() );
++        qWarning() << "QwtMmlNode::scriptlevel(): could not parse value: \"" + expl_sl_str + "\"";
+         return parent_sl;
+     }
+ }
+@@ -5637,7 +5638,7 @@
+ 
+         if ( !literal.startsWith( "&#" ) )
+         {
+-            qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() );
++            qWarning() << "decodeEntityValue(): bad entity literal: \"" + literal + "\"";
+             return QString::null;
+         }
+ 
+@@ -5646,7 +5647,7 @@
+         int i = literal.indexOf( ';' );
+         if ( i == -1 )
+         {
+-            qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() );
++            qWarning() << "decodeEntityValue(): bad entity literal: \"" + literal + "\"";
+             return QString::null;
+         }
+ 
+@@ -5655,7 +5656,7 @@
+ 
+         if ( char_code.isEmpty() )
+         {
+-            qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() );
++            qWarning() << "decodeEntityValue(): bad entity literal: \"" + literal + "\"";
+             return QString::null;
+         }
+ 
+@@ -5666,7 +5667,7 @@
+             unsigned c = char_code.toUInt( &ok, 16 );
+             if ( !ok )
+             {
+-                qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() );
++                qWarning() << "decodeEntityValue(): bad entity literal: \"" + literal + "\"";
+                 return QString::null;
+             }
+             result += QChar( c );
+@@ -5677,7 +5678,7 @@
+             unsigned c = char_code.toUInt( &ok, 10 );
+             if ( !ok )
+             {
+-                qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() );
++                qWarning() << "decodeEntityValue(): bad entity literal: \"" + literal + "\"";
+                 return QString::null;
+             }
+             result += QChar( c );
diff --git a/recipes-qt4/recipes-libs/qwt.inc b/recipes-qt4/recipes-libs/qwt.inc
index 60f73a6..b84505b 100644
--- a/recipes-qt4/recipes-libs/qwt.inc
+++ b/recipes-qt4/recipes-libs/qwt.inc
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
            file://qwt6.patch \
-           file://qwt6-fix-linking-with-ld-gold.patch"
+           file://qwt6-fix-linking-with-ld-gold.patch \
+           file://warnings.patch"
 
 S = "${WORKDIR}/qwt-${PV}"
 
-- 
2.8.1