[SCM] qtbase packaging branch, experimental, updated. debian/5.3.2+dfsg-4-4-g1ee7238

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 9973b2322a9eccaaf1ebaa71ceb8cf8f925182c4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Dec 11 15:54:35 2014 +0300

    Refresh patches, drop two that were applied upstream.
---
 debian/changelog                                   |  2 +
 .../fix_bug_in_internal_comparison_operator.patch  | 73 ----------------------
 debian/patches/fix_sparc_atomics.patch             | 21 -------
 debian/patches/mips_more_pre-mips32.diff           |  2 +-
 debian/patches/series                              |  4 --
 5 files changed, 3 insertions(+), 99 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a82b8b..3b806b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop fix_bug_in_internal_comparison_operator.patch, applied upstream.
+  * Drop fix_sparc_atomics.patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Dec 2014 15:52:26 +0300
 
diff --git a/debian/patches/fix_bug_in_internal_comparison_operator.patch b/debian/patches/fix_bug_in_internal_comparison_operator.patch
deleted file mode 100644
index 01e30ea..0000000
--- a/debian/patches/fix_bug_in_internal_comparison_operator.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Author: Lars Knoll <lars.knoll at digia.com>
-Date: Fri, 5 Sep 2014 12:58:19 +0200
-Description: [PATCH] Fix bugs in internal comparison operators
- Lisandro removed the tests part as it didn't apply and we are not
- running them anyway.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-The comparison operators between QJsonPrivate::String
-and QJsonPrivate::Latin1String weren't all correct, leading
-to wrong sorting of keys in QJsonObjects when the keys were
-outside of the latin1 range and resulting lookup errors.
-
-Task-number: QTBUG-41100
-Change-Id: Idceff615f85d7ab874ad2a8e4a6c1ce8c2aa0f65
-Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki at digia.com>
----
- src/corelib/json/qjson_p.h |   23 ++++++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
-
---- a/src/corelib/json/qjson_p.h
-+++ b/src/corelib/json/qjson_p.h
-@@ -352,7 +352,7 @@ public:
-         return !memcmp(d->utf16, str.d->utf16, d->length*sizeof(ushort));
-     }
-     inline bool operator<(const String &other) const;
--    inline bool operator >=(const String &other) const { return other < *this; }
-+    inline bool operator >=(const String &other) const { return !(*this < other); }
- 
-     inline QString toString() const {
- #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-@@ -412,12 +412,29 @@ public:
-             val = d->length - str.d->length;
-         return val >= 0;
-     }
-+    inline bool operator<(const String &str) const
-+    {
-+        const qle_ushort *uc = (qle_ushort *) str.d->utf16;
-+        if (!uc || *uc == 0)
-+            return false;
-+
-+        const uchar *c = (uchar *)d->latin1;
-+        const uchar *e = c + qMin((int)d->length, (int)str.d->length);
- 
-+        while (c < e) {
-+            if (*c != *uc)
-+                break;
-+            ++c;
-+            ++uc;
-+        }
-+        return (c == e ? (int)d->length < (int)str.d->length : *c < *uc);
-+
-+    }
-     inline bool operator ==(const String &str) const {
-         return (str == *this);
-     }
-     inline bool operator >=(const String &str) const {
--        return (str < *this);
-+        return !(*this < str);
-     }
- 
-     inline QString toString() const {
-@@ -454,7 +471,7 @@ inline bool String::operator <(const Str
-         a++,b++;
-     if (l==-1)
-         return (alen < blen);
--    return (ushort)*a - (ushort)*b;
-+    return (ushort)*a < (ushort)*b;
- }
- 
- inline bool String::operator<(const Latin1String &str) const
diff --git a/debian/patches/fix_sparc_atomics.patch b/debian/patches/fix_sparc_atomics.patch
deleted file mode 100644
index 8d0667a..0000000
--- a/debian/patches/fix_sparc_atomics.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Do not use specific headers for Sparc atomics
- By removing the unexistant sparc headers the C++11 ones will be used.
-Author: Adam Majer <adamm at debian.org>
-Forwarded: no
-Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-
----
- src/corelib/thread/qbasicatomic.h |    2 --
- 1 file changed, 2 deletions(-)
-
---- a/src/corelib/thread/qbasicatomic.h
-+++ b/src/corelib/thread/qbasicatomic.h
-@@ -62,8 +62,6 @@
- #  include "QtCore/qatomic_ia64.h"
- #elif defined(Q_PROCESSOR_MIPS)
- #  include "QtCore/qatomic_mips.h"
--#elif defined(Q_PROCESSOR_SPARC)
--#  include "QtCore/qatomic_sparc.h"
- #elif defined(Q_PROCESSOR_X86)
- #  include <QtCore/qatomic_x86.h>
- 
diff --git a/debian/patches/mips_more_pre-mips32.diff b/debian/patches/mips_more_pre-mips32.diff
index 5a95196..cd7491c 100644
--- a/debian/patches/mips_more_pre-mips32.diff
+++ b/debian/patches/mips_more_pre-mips32.diff
@@ -10,7 +10,7 @@ Forwarded: no
 
 --- a/src/corelib/arch/qatomic_mips.h
 +++ b/src/corelib/arch/qatomic_mips.h
-@@ -128,7 +128,10 @@ void QBasicAtomicOps<size>::releaseMemor
+@@ -120,7 +120,10 @@
  template <int size> template <typename T> inline
  void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
  {
diff --git a/debian/patches/series b/debian/patches/series
index 6acfddb..48eafbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,10 +2,6 @@ remove_icon_from_example.patch
 hurd_opengl_incldir.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
-fix_bug_in_internal_comparison_operator.patch
-
-# Patches that need to be upstreamed
-fix_sparc_atomics.patch
 
 # Debian specific.
 remove_google_adsense.patch

-- 
qtbase packaging