[SCM] qtbase packaging branch, experimental, updated. debian/5.2.1+dfsg-3-23-g1874e40

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit a914a0cdeed53781d9c0d0c81518fb3a16349a3b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 20 01:10:13 2014 -0300

    Refresh enable_sparc_detection.patch.
---
 debian/changelog                            | 1 +
 debian/patches/enable_sparc_detection.patch | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1334382..6a166a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ qtbase-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
     - hurd_opengl_incldir.diff
     - support_mips_atomic_on_pre-mips32_archs.patch
     - qatomic_mips.h
+    - enable_sparc_detection.patch
   * Remove patches:
     - fix_power_atomic_code.patch, the code it patches has been removed.
     - enable_s390_detection.patch, applied upstream.
diff --git a/debian/patches/enable_sparc_detection.patch b/debian/patches/enable_sparc_detection.patch
index 79693f9..fce555b 100644
--- a/debian/patches/enable_sparc_detection.patch
+++ b/debian/patches/enable_sparc_detection.patch
@@ -2,11 +2,13 @@ Description: enable sparc processor detection
 Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Forwarded: https://codereview.qt-project.org/#change,74515
 
-diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
-index 623e30a..684b7b5 100644
+---
+ src/corelib/global/qprocessordetection.h |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
 --- a/src/corelib/global/qprocessordetection.h
 +++ b/src/corelib/global/qprocessordetection.h
-@@ -292,12 +292,12 @@
+@@ -294,12 +294,12 @@
      SPARC is big-endian only prior to V9, while V9 is bi-endian with big-endian
      as the default byte order. Assume all SPARC systems are big-endian.
  */

-- 
qtbase packaging