[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+dfsg-2-12-g9829fd7

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 22c1226e9794bd1acaeb8dda0608d9fbba3ad596
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 24 23:48:17 2014 -0300

    Refresh patches.
---
 debian/changelog                                              |  1 +
 .../02_syncqt_sane_timestamp_for_nonexisting_headers.diff     |  2 +-
 debian/patches/dont_crash_on_broken_gif_images.patch          | 11 +++--------
 debian/patches/qtdebug_syslog.patch                           |  2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66d9bd8..39e3008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-1) UNRELEASED; urgency=medium
   * Enable using system network proxies by default.
     - Add this information to debian/NEWS to inform our users.
   * Update symbols files with buildd's logs.
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Jun 2014 01:19:21 -0300
 
diff --git a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
index 830058e..838754f 100644
--- a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -15,7 +15,7 @@ GMT.) for the symlink, just use current time().
 
 --- a/bin/syncqt
 +++ b/bin/syncqt
-@@ -884,7 +884,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -886,7 +886,7 @@ foreach my $lib (@modules_to_sync) {
                              print "SYMBOL: $_
";
                          }
                      } else {
diff --git a/debian/patches/dont_crash_on_broken_gif_images.patch b/debian/patches/dont_crash_on_broken_gif_images.patch
index 4524a8f..2eb396f 100644
--- a/debian/patches/dont_crash_on_broken_gif_images.patch
+++ b/debian/patches/dont_crash_on_broken_gif_images.patch
@@ -16,15 +16,13 @@ Task-number: QTBUG-38367
 Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
 Security-advisory: CVE-2014-0190
 ---
- src/gui/image/qgifhandler.cpp | 7 +++++++
+ src/gui/image/qgifhandler.cpp |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 3324f04..5199dd3 100644
 --- a/src/gui/image/qgifhandler.cpp
 +++ b/src/gui/image/qgifhandler.cpp
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
-                     memset(bits, 0, image->byteCount());
+@@ -366,6 +366,13 @@ int QGIFFormat::decode(QImage *image, co
+                     return -1;
                  }
  
 +                // Check if the previous attempt to create the image failed. If it
@@ -37,6 +35,3 @@ index 3324f04..5199dd3 100644
                  disposePrevious(image);
                  disposed = false;
  
--- 
-1.8.5.1
-
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index b131243..6b3f131 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -25,7 +25,7 @@ Author: Thiago Macieira <thiago at kde.org>
  #endif
  
  QT_BEGIN_NAMESPACE
-@@ -2324,6 +2327,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2327,6 +2330,27 @@ void qt_message_output(QtMsgType msgType
  #else
          fprintf(stderr, "%s
", buf);
          fflush(stderr);

-- 
Qt 4 packaging