[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-32-ge68cb12

[Timo Jyrinki]

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

The following commit has been merged in the experimental branch:
commit e68cb122a0155207f7bdc7b87f1112971aa814f0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jul 6 15:07:37 2015 +0000

    Add debian/patches/Fix-compile-error-on-big-endian.patch
    
    Conflicts:
    	debian/changelog
    	debian/patches/series
---
 debian/changelog                                   |  2 ++
 .../patches/Fix-compile-error-on-big-endian.patch  | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1326376..266d429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
 
   [ Timo Jyrinki ]
   * Build depend on GStreamer 1.0 and add a configure option for it.
+  * debian/patches/Fix-compile-error-on-big-endian.patch:
+    - Fix FTBFS on powerpc.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
 
diff --git a/debian/patches/Fix-compile-error-on-big-endian.patch b/debian/patches/Fix-compile-error-on-big-endian.patch
new file mode 100644
index 0000000..d8bcae0
--- /dev/null
+++ b/debian/patches/Fix-compile-error-on-big-endian.patch
@@ -0,0 +1,28 @@
+From 1a8b161da80b93d122854c854c95bf9f7d326cdc Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+Date: Fri, 3 Jul 2015 14:19:02 +0200
+Subject: [PATCH] Fix compile error on big endian
+
+DestFormat is not defined here but should be Format_RGBX8888
+
+Change-Id: Ie33989a6fc31650434281a6b7b0f4806524268af
+---
+ src/gui/image/qimage_conversions.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
+index e0ca2c5..02f32aa 100644
+--- a/src/gui/image/qimage_conversions.cpp
++++ b/src/gui/image/qimage_conversions.cpp
+@@ -1103,7 +1103,7 @@ static bool mask_alpha_converter_rgbx_inplace(QImageData *data, Qt::ImageConvers
+         }
+         rgb_data += pad;
+     }
+-    data->format = DestFormat;
++    data->format = QImage::Format_RGBX8888;
+     return true;
+ #endif
+ }
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 46c7375..d348d28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ revert_upstream_bsymbolic_change.patch
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 hurd-forkfd.diff
+Fix-compile-error-on-big-endian.patch

-- 
qtbase packaging