[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-37-g5def846

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit 5def846bde3ace5e4bc2eda14425989b7241d59c
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Dec 28 11:05:21 2011 +0200

    Add fix_ftbfs_format-security.patch:
     due to debian/compat bump to 9, Qt is built with -Werror=format-security
     and trigger an error: format not a string literal and no format arguments.
---
 debian/changelog                               |    4 +++
 debian/patches/fix_ftbfs_format-security.patch |   33 ++++++++++++++++++++++++
 debian/patches/series                          |    1 +
 3 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c26e87..89425f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
   * Add patches:
     - qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
       plugin path.
+    - fix_ftbfs_format-security.patch
+      due to debian/compat bump to 9, Qt is built with -Werror=format-security
+      and trigger an error: format not a string literal and no format
+      arguments.
   * Update debian/compat: bump to 9 for multiarch.
   * Update debian/control:
     - mark Qt libraries as Multi-Arch.
diff --git a/debian/patches/fix_ftbfs_format-security.patch b/debian/patches/fix_ftbfs_format-security.patch
new file mode 100644
index 0000000..0f96675
--- /dev/null
+++ b/debian/patches/fix_ftbfs_format-security.patch
@@ -0,0 +1,33 @@
+Description: due to debian/compat bump to 9, Qt is built with
+             -Werror=format-security and trigger an error: format not a string
+             literal and no format arguments.
+
+---
+ src/declarative/debugger/qdeclarativedebugserver.cpp |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
++++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
+@@ -216,16 +216,16 @@ QDeclarativeDebugServer *QDeclarativeDeb
+                 }
+ 
+             } 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()).toAscii().constData();
+             }
+         }
+ #else
+         if (!appD->qmljsDebugArgumentsString().isEmpty()) {
+-            qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+-                                        "QtDeclarative is not configured for debugging.").arg(
+-                         appD->qmljsDebugArgumentsString()).toAscii().constData());
++            qWarning() << QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
++                                             "QtDeclarative is not configured for debugging.").arg(
++                         appD->qmljsDebugArgumentsString()).toAscii().constData();
+         }
+ #endif
+     }
diff --git a/debian/patches/series b/debian/patches/series
index f0d1e8e..f5891dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,3 +37,4 @@ sh.diff
 kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 qt-multiarch-plugin-path-compat.diff
+fix_ftbfs_format-security.patch

-- 
Qt 4 packaging