[SCM] qtbase packaging branch, master, updated. debian/5.3.0+dfsg-4-3-gcf5b2d9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 6597b5a69a0c280276d632c12b6a7fa62854f067
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jun 7 15:29:24 2014 -0300

    Remove enable_sparc_detection.patch which causes a FTBFS now.
---
 debian/changelog                            |  5 +++++
 debian/patches/enable_sparc_detection.patch | 29 -----------------------------
 debian/patches/series                       |  1 -
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10092dc..c1d8442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtbase-opensource-src (5.3.0+dfsg-5) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove enable_sparc_detection.patch. This is causing a FTBFS in sparc now.
+    I've contacted upstream to know the best way to go from here, in the
+    meantime we just don't detect it.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Jun 2014 15:27:33 -0300
 
 qtbase-opensource-src (5.3.0+dfsg-4) unstable; urgency=medium
diff --git a/debian/patches/enable_sparc_detection.patch b/debian/patches/enable_sparc_detection.patch
deleted file mode 100644
index fce555b..0000000
--- a/debian/patches/enable_sparc_detection.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-
----
- 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
-@@ -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.
- */
--// #elif defined(__sparc__)
--// #  define Q_PROCESSOR_SPARC
--// #  if defined(__sparc_v9__)
--// #    define Q_PROCESSOR_SPARC_V9
--// #  endif
--// #  define Q_BYTE_ORDER Q_BIG_ENDIAN
-+#elif defined(__sparc__)
-+#  define Q_PROCESSOR_SPARC
-+#  if defined(__sparc_v9__)
-+#    define Q_PROCESSOR_SPARC_V9
-+#  endif
-+#  define Q_BYTE_ORDER Q_BIG_ENDIAN
- 
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index aec5720..a0016d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ hurd_opengl_incldir.diff
 support_mips_atomic_on_pre-mips32_archs.patch
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
-enable_sparc_detection.patch
 Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
 
 # Debian specific.

-- 
qtbase packaging