[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-15-g515364a

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=8fc335c

The following commit has been merged in the experimental branch:
commit 8fc335c9149e2711c507eb65c36e882164f7f7f3
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Apr 3 17:58:12 2012 +0200

    Drop fix_ftbfs_format-security.patch, fixed upstream.
---
 debian/changelog                               |    3 ++
 debian/patches/fix_ftbfs_format-security.patch |   33 ------------------------
 debian/patches/series                          |    1 -
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e68c786..50ad2cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ qt4-x11 (4:4.8.1-1) UNRELEASED; urgency=low
     The patch was partly merged in Qt 4.8.
   * Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
 
+  [ Felix Geyer ]
+  * Drop fix_ftbfs_format-security.patch, fixed upstream.
+
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 Jan 2012 22:15:56 +0200
 
 qt4-x11 (4:4.8.0-1) experimental; urgency=low
diff --git a/debian/patches/fix_ftbfs_format-security.patch b/debian/patches/fix_ftbfs_format-security.patch
deleted file mode 100644
index 0f96675..0000000
--- a/debian/patches/fix_ftbfs_format-security.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 e76cde9..1b8b79c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,7 +39,6 @@ sh.diff
 kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 qt-multiarch-plugin-path-compat.diff
-fix_ftbfs_format-security.patch
 fix_qvfb_build.patch
 s390x_jscore.diff
 add_missing_method_for_QBasicAtomicPointer_on_s390.patch

-- 
Qt 4 packaging