[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-6-4-gce42288

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit ce422880ef181f45f42f97ddbffdc85cc452fe61
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 16 21:10:44 2015 +0300

    Drop Fix-compile-error-on-big-endian.patch.
    
    The fix was applied upstream in 5.5.1, and the refreshed version of that patch
    changes an unrelated function.
---
 debian/changelog                                   |  3 +++
 .../patches/Fix-compile-error-on-big-endian.patch  | 23 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10000d9..dcb25a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.5.1+dfsg-7) UNRELEASED; urgency=medium
   * Backport upstream change (detect_64bit_atomic.diff) to auto-detect
     whether 64-bit std::atomic really works.
   * Mark mips_no_atomic.diff as applied upstream.
+  * Drop Fix-compile-error-on-big-endian.patch. The fix was applied upstream
+    in 5.5.1, and the refreshed version of that patch changes an unrelated
+    function.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Nov 2015 20:54:27 +0300
 
diff --git a/debian/patches/Fix-compile-error-on-big-endian.patch b/debian/patches/Fix-compile-error-on-big-endian.patch
deleted file mode 100644
index b825592..0000000
--- a/debian/patches/Fix-compile-error-on-big-endian.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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(-)
-
---- a/src/gui/image/qimage_conversions.cpp
-+++ b/src/gui/image/qimage_conversions.cpp
-@@ -1054,7 +1054,7 @@ static bool mask_alpha_converter_inplace
-         }
-         rgb_data += pad;
-     }
--    data->format = DestFormat;
-+    data->format = QImage::Format_RGBX8888;
-     return true;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 24fd1df..540ebe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Backported stuff
-Fix-compile-error-on-big-endian.patch
 set_positionautomatic.diff
 set_WA_OutsideWSRange_for_native_widgets.patch
 bsd_volumeinfo.diff

-- 
qtbase packaging