Fix build with USE=c++0x and gcc-4.8.0 (bug 465590)

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 50 insertions, 2 deletions

diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index 333583c41622..b018c00b11e7 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtcore
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.14 2013/04/20 07:47:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.15 2013/05/27 09:49:57 pesa Exp $
+
+  27 May 2013; Davide Pesavento <pesa@gentoo.org>
+  +files/rename-qAbs-function-for-timeval.patch, qtcore-4.8.4-r5.ebuild:
+  Fix build with USE=c++0x and gcc-4.8.0 (bug 465590)
 
   20 Apr 2013; Davide Pesavento <pesa@gentoo.org>
   -files/moc-workaround-for-boost-1.48.patch, -qtcore-4.8.4-r2.ebuild:
diff --git a/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch b/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch
new file mode 100644
index 000000000000..a862ae83504c
--- /dev/null
+++ b/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch
@@ -0,0 +1,43 @@
+From 522c899b777eb25adb7e235baf0027c0c0a9119a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@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@intel.com>
+(cherry-picked from qtbase commit d9ff510f02bba63dabe7a081a68296056a89ae4c)
+Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
+---
+ src/corelib/kernel/qeventdispatcher_unix.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
+index df3cda1..abf1c29 100644
+--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
++++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
+@@ -356,8 +356,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) {
+@@ -406,7 +405,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);
+ }
+ 
+ void QTimerInfoList::repairTimersIfNeeded()
+-- 
+1.8.2.1
+
diff --git a/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild
index 980565081a76..00fa427d68ef 100644
--- a/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild,v 1.2 2013/04/08 15:04:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild,v 1.3 2013/05/27 09:49:57 pesa Exp $
 
 EAPI=5
 
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch"
 	"${FILESDIR}/CVE-2013-0254.patch"
 	"${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch"
+	"${FILESDIR}/rename-qAbs-function-for-timeval.patch"
 	"${WORKDIR}/${P}-update-defaultNumberingSystem.patch"
 )