[SCM] qtbase packaging branch, experimental, updated. debian/5.5.0+dfsg-6-8-g2b9e394

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit d08ad1ccbb9ef937d29de7554ebd9d26dbcea860
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Oct 9 18:38:25 2015 -0300

    Refersh patch.
---
 debian/changelog                                     |  1 +
 debian/patches/Fix-compile-error-on-big-endian.patch | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed39142..22d9027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ qtbase-opensource-src (5.5.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump qtbase-abi to 5-5-1.
   * Remove screen_crash.patch, already present upstream.
+  * Refresh Fix-compile-error-on-big-endian.patch.
 
  -- Sune Vuorela <sune at debian.org>  Tue, 22 Sep 2015 08:28:30 +0200
 
diff --git a/debian/patches/Fix-compile-error-on-big-endian.patch b/debian/patches/Fix-compile-error-on-big-endian.patch
index d8bcae0..b825592 100644
--- a/debian/patches/Fix-compile-error-on-big-endian.patch
+++ b/debian/patches/Fix-compile-error-on-big-endian.patch
@@ -7,22 +7,17 @@ DestFormat is not defined here but should be Format_RGBX8888
 
 Change-Id: Ie33989a6fc31650434281a6b7b0f4806524268af
 ---
- src/gui/image/qimage_conversions.cpp | 2 +-
+ 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
+@@ -1054,7 +1054,7 @@ static bool mask_alpha_converter_inplace
          }
          rgb_data += pad;
      }
 -    data->format = DestFormat;
 +    data->format = QImage::Format_RGBX8888;
      return true;
- #endif
  }
--- 
-2.1.4
-
+ 

-- 
qtbase packaging