[SCM] Qt 4 packaging branch, master, updated. debian/4.7.4-2-4-g8d94a4d

Pino Toscano pino at alioth.debian.org
Mon Mar 5 21:12:07 UTC 2012


The following commit has been merged in the master branch:
commit 2d6380aecc618ae466ca63de66bdcf5306c6b8c7
Author: Pino Toscano <pino at debian.org>
Date:   Mon Mar 5 22:04:05 2012 +0100

    fix build failure with -Werror=format-security
    
    add patch fix-format.diff for it
---
 debian/changelog               |    1 +
 debian/patches/fix-format.diff |   25 +++++++++++++++++++++++++
 debian/patches/series          |    1 +
 3 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3255335..21f46eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qt4-x11 (4:4.7.4-3) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Switch the libpng12-dev build dependency to libpng-dev. (Closes: #662484)
+  * Fix build failure with -Werror=format-security (patch fix-format.diff).
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 06 Jan 2012 21:54:25 +0200
 
diff --git a/debian/patches/fix-format.diff b/debian/patches/fix-format.diff
new file mode 100644
index 0000000..5dc7806
--- /dev/null
+++ b/debian/patches/fix-format.diff
@@ -0,0 +1,25 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix format in printf-like functions, like qWarning(...)
+ Switch a qWarning(...) call to the stream-like version to avoid using
+ a raw C string as printf-like format (triggering a compiling error with
+ -Werror=format-security).
+ .
+ The issue has been fixed in Qt 4.8.
+Last-Update: 2012-03-05
+Forwarded: no
+Origin: vendor
+
+--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
++++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
+@@ -207,9 +207,8 @@
+                 }
+ 
+             } else {
+-                qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+-                                            "Format is -qmljsdebugger=port:<port>[,block]").arg(
+-                             appD->qmljsDebugArgumentsString()).toAscii().constData());
++                qWarning() << QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
++                                                 "Format is -qmljsdebugger=port:<port>[,block]").arg(appD->qmljsDebugArgumentsString());
+             }
+         }
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index 14e5289..a6b9b08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,3 +54,4 @@ blacklist-diginotar-cert.diff
 openssl_no_ssl2.patch
 Remove_QtHelp_dependency_on_QtXml.patch
 CVE-2011-3922.patch
+fix-format.diff

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list