[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-5-15-g8c4381c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8c4381cecb6697a3a3d5263311275e40ac29818b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jun 19 18:43:18 2013 -0300

    Fix FTBFS.
    
    Use patch from upstream.
---
 debian/changelog                                   |    2 +
 .../patches/Rename-qAbs-Function-for-timeval.patch |   41 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a51e75c..f622f75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ qtbase-opensource-src (5.0.2+dfsg1-6) UNRELEASED; urgency=low
     - OpenVG.
     - GStreamer.
   * Add libgbm-dev as Build-Dep, necessary for KMS support.
+  * Apply Rename-qAbs-Function-for-timeval.patch taken from upstream to solve
+    FTBFS with GCC 4.8.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Jun 2013 14:43:47 -0300
 
diff --git a/debian/patches/Rename-qAbs-Function-for-timeval.patch b/debian/patches/Rename-qAbs-Function-for-timeval.patch
new file mode 100644
index 0000000..ec3b1a5
--- /dev/null
+++ b/debian/patches/Rename-qAbs-Function-for-timeval.patch
@@ -0,0 +1,41 @@
+From d9ff510f02bba63dabe7a081a68296056a89ae4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez at computer.org>
+Date: Sat, 23 Feb 2013 23:14:50 -0500
+Subject: [PATCH] Rename qAbs Function for timeval
+
+This decouples it from qAbs which is declared as a constexpr under
+certain compilation flags and enables for qtbase to be compiled with
+GCC 4.8
+
+Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+---
+ src/corelib/kernel/qtimerinfo_unix.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
+index 0eee425..7a29247 100644
+--- a/src/corelib/kernel/qtimerinfo_unix.cpp
++++ b/src/corelib/kernel/qtimerinfo_unix.cpp
+@@ -94,8 +94,7 @@ timeval QTimerInfoList::updateCurrentTime()
+ 
+ #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED)
+ 
+-template <>
+-timeval qAbs(const timeval &t)
++timeval qAbsTimeval(const timeval &t)
+ {
+     timeval tmp = t;
+     if (tmp.tv_sec < 0) {
+@@ -144,7 +143,7 @@ bool QTimerInfoList::timeChanged(timeval *delta)
+     timeval tickGranularity;
+     tickGranularity.tv_sec = 0;
+     tickGranularity.tv_usec = msPerTick * 1000;
+-    return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
++    return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10);
+ }
+ 
+ /*
+-- 
+1.8.3.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 0b1eef3..19257fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 undef_B0.diff
 deppath_gnu.diff
+Rename-qAbs-Function-for-timeval.patch
 
 # Debian specific.
 build_examples.patch

-- 
qtbase packaging