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

[Adam Majer]

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

The following commit has been merged in the experimental branch:
commit cfd7786b89ef7afaf25f3686a03e9e73bfd4cb99
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Sep 18 15:30:31 2014 -0500

    Revert "Add a patch to SYNC hint for the release barrier"
    
    This patch was already included, and `patch` patched wrong place
    anyway...
    
    This reverts commit 13bd6dbd0c562aa3441c555a5ea215cd66b64db5.
---
 debian/changelog                       |  4 ----
 debian/patches/mips32_wrong_hint.patch | 35 ----------------------------------
 debian/patches/series                  |  3 +--
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 362f454..19a5a86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,6 @@ qtbase-opensource-src (5.3.2+dfsg-2) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add Adam Majer's fix_sparc_atomics.patch to let Sparc use C++11's atomics.
 
-  [ Adam Majer ]
-  * Add mips32_wrong_hint.patch to fix wrong SYNC hunt for the release
-    barrier
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Sep 2014 15:49:52 -0300
 
 qtbase-opensource-src (5.3.2+dfsg-1) experimental; urgency=medium
diff --git a/debian/patches/mips32_wrong_hint.patch b/debian/patches/mips32_wrong_hint.patch
deleted file mode 100644
index a19a416..0000000
--- a/debian/patches/mips32_wrong_hint.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c6718f01c20779da00689b3ef66ede7af5fe8ce5 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira at intel.com>
-Date: Tue, 12 Aug 2014 09:47:41 -0700
-Subject: [PATCH] Correct the SYNC hint for the release barrier
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The MIPS32 manual I have says 0x11 is SYNC_ACQUIRE and 0x12 is
-SYNC_RELEASE. The change was an unintentional mistake in commit
-60b6b28c213a420ee40e254ff1823876098e0a04.
-
-Thanks to Spencer Schumann for spotting this.
-
-Change-Id: I16885e4e86e8befa8931733d0b5a54ac9942f176
-Reviewed-by: Spencer Schumann <spencer.schumann at echostar.com>
-Reviewed-by: Olivier Goffart <ogoffart at woboq.com>
-Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
----
- src/corelib/arch/qatomic_mips.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: qtbase/src/corelib/arch/qatomic_mips.h
-===================================================================
---- qtbase.orig/src/corelib/arch/qatomic_mips.h	2014-09-17 22:52:52.884106628 -0500
-+++ qtbase/src/corelib/arch/qatomic_mips.h	2014-09-17 22:52:52.880106627 -0500
-@@ -112,7 +112,7 @@
- {
-     asm volatile (".set push
"
-                   ".set mips32
"
--                  "sync 0x11
"
-+                  "sync 0x12
"
-                   ".set pop
" ::: "memory");
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index ad1592f..67bb3b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,9 +3,8 @@ hurd_opengl_incldir.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
 
-# Patches that were upstreamed for 5.3.3
+# Patches that need to be upstreamed
 fix_sparc_atomics.patch
-mips32_wrong_hint.patch
 
 # Debian specific.
 remove_google_adsense.patch

-- 
qtbase packaging