[SCM] qtbase packaging branch, experimental, updated. debian/5.3.2+dfsg-4-21-gec47d01

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ec47d01db8f9343981d7aa48b7a05e2a34b8435a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 16 13:38:28 2014 +0300

    Add a patch to fix qimage_conversions.cpp build on big endian systems.
---
 debian/changelog                                 |  2 ++
 debian/patches/bigendian_qimage_conversions.diff | 20 ++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 130932f..848a55a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.4.0+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Add a patch to fix qstorageinfo_unix.cpp build on kFreeBSD.
+  * Add a patch to fix qimage_conversions.cpp build on big endian
+    systems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 16 Dec 2014 13:32:15 +0300
 
diff --git a/debian/patches/bigendian_qimage_conversions.diff b/debian/patches/bigendian_qimage_conversions.diff
new file mode 100644
index 0000000..c56ce32
--- /dev/null
+++ b/debian/patches/bigendian_qimage_conversions.diff
@@ -0,0 +1,20 @@
+--- a/src/gui/image/qimage_conversions.cpp
++++ b/src/gui/image/qimage_conversions.cpp
+@@ -2252,7 +2252,7 @@
+         convert_ARGB_to_ARGB_PM,
+ #else
+         0,
+-        0
++        0,
+ #endif
+         0, 0, 0, 0
+     }, // Format_RGBA8888
+@@ -2281,7 +2281,7 @@
+ #else
+         0,
+         0,
+-        0
++        0,
+ #endif
+         0, 0, 0, 0
+     }, // Format_RGBA8888_Premultiplied
diff --git a/debian/patches/series b/debian/patches/series
index b04ccfd..4324065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ hurd_opengl_incldir.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
 bsd_statfs.diff
+bigendian_qimage_conversions.diff
 
 # Debian specific.
 remove_google_adsense.patch

-- 
qtbase packaging