[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-4-6-g5d5b983

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 5d5b9837f0f49ec78d2c3fd333640a40b7a79769
Author: Pino Toscano <pino at debian.org>
Date:   Wed Dec 31 00:02:26 2014 +0100

    replace bigendian_qimage_conversions.diff with upstream commit
---
 debian/changelog                                   |  2 ++
 debian/patches/bigendian_qimage_conversions.diff   | 24 --------------
 debian/patches/series                              |  2 +-
 ...ersions.cpp-Fix-build-on-big-endian-syste.patch | 37 ++++++++++++++++++++++
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9db1663..d0d62ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Replace patch bsd_statfs.diff with
     upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch,
     backport of upstream commit 13972476ad2c3178fe89f2d96f398de10394c6f6.
+  * Replace (rename) patch bigendian_qimage_conversions.diff with
+    upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Dec 2014 23:42:00 +0100
 
diff --git a/debian/patches/bigendian_qimage_conversions.diff b/debian/patches/bigendian_qimage_conversions.diff
deleted file mode 100644
index 6b7d270..0000000
--- a/debian/patches/bigendian_qimage_conversions.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: fix qimage_conversions.cpp build on big endian systems
-Origin: upstream, https://qt.gitorious.org/qt/qtbase/commit/404f4281fda764ca
-Last-Update: 2014-12-16
-
---- 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 69a0d94..fe4f9d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch
+upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch
 gnukfreebsd.diff
-bigendian_qimage_conversions.diff
 
 # Debian specific.
 revert_upstream_bsymbolic_change.patch
diff --git a/debian/patches/upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch b/debian/patches/upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch
new file mode 100644
index 0000000..0e0c4f4
--- /dev/null
+++ b/debian/patches/upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch
@@ -0,0 +1,37 @@
+From 404f4281fda764cafdaa5635db995dabc4f1de8c Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Tue, 9 Dec 2014 09:27:53 +0300
+Subject: [PATCH] qimage_conversions.cpp: Fix build on big endian systems
+
+Change-Id: I8149eb2deaa101daf85a957ff48c3a7140c43bbc
+Reviewed-by: Timo Jyrinki <timo.jyrinki at canonical.com>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+---
+ src/gui/image/qimage_conversions.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
+index 17563b1..858a0d9 100644
+--- a/src/gui/image/qimage_conversions.cpp
++++ b/src/gui/image/qimage_conversions.cpp
+@@ -2252,7 +2252,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
+         convert_ARGB_to_ARGB_PM,
+ #else
+         0,
+-        0
++        0,
+ #endif
+         0, 0, 0, 0
+     }, // Format_RGBA8888
+@@ -2281,7 +2281,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
+ #else
+         0,
+         0,
+-        0
++        0,
+ #endif
+         0, 0, 0, 0
+     }, // Format_RGBA8888_Premultiplied
+-- 
+2.1.4
+

-- 
qtbase packaging