[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git49-gbc62005+dfsg-1-15-ge48297a

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit e48297a9a54e66b8c01d9a7aa78892e89de4eaa6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Aug 23 15:51:09 2014 -0300

    Add proper headers to the patch.
    
    And put the patch in the correct order in the series file.
---
 debian/patches/fix_libmng_test.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/fix_libmng_test.patch b/debian/patches/fix_libmng_test.patch
new file mode 100644
index 0000000..330b807
--- /dev/null
+++ b/debian/patches/fix_libmng_test.patch
@@ -0,0 +1,24 @@
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Description: Fix libmng test.
+ libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should
+ include stdio.h [0].
+ .
+ [0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10>
+ .
+ So adding the corresponding include before libmng solves the issue.
+Forwarded: https://codereview.qt-project.org/#/c/93061/
+
+---
+ config.tests/unix/libmng/libmng.cpp |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/config.tests/unix/libmng/libmng.cpp
++++ b/config.tests/unix/libmng/libmng.cpp
+@@ -39,6 +39,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <stdio.h>
+ #include <libmng.h>
+ 
+ int main(int, char **)
diff --git a/debian/patches/series b/debian/patches/series
index 746d758..cbb6eae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@ dont_crash_on_broken_gif_images.patch
 aarch64_arm64_fix_arch_detection.patch
 aarch64_arm64_mkspecs.patch
 aarch64_arm64_qatomic_support.patch
+fix_libmng_test.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging