diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-07-05 22:39:59 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-07-05 22:39:59 -0300 |
| commit | a791632a928ac9d835668d25a66250d2a4007262 (patch) | |
| tree | 3652601e3b001e911739a0ca28a19211f1aae30d | |
| parent | c2649da32186ae3b736bc814629f4fe58d8a259f (diff) | |
| download | qtbase-a791632a928ac9d835668d25a66250d2a4007262.tar.gz | |
Remove Rename-qAbs-Function-for-timeval.patch applied upstream.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/Rename-qAbs-Function-for-timeval.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index 8b547d8..cd07cc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,9 @@ qtbase-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low * Fix watch file with new url. * Make libqt5core5 provide qtbase-abi-5-1-0. * Update symbols files with latest 5.0.2 build logs. - * Remove patches applied upstream: undef_B0.diff. + * Remove patches applied upstream: + - undef_B0.diff + - Rename-qAbs-Function-for-timeval.patch * Refresh patches: deppath_gnu.diff. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 27 Jun 2013 14:04:21 -0300 diff --git a/debian/patches/Rename-qAbs-Function-for-timeval.patch b/debian/patches/Rename-qAbs-Function-for-timeval.patch deleted file mode 100644 index ec3b1a5..0000000 --- a/debian/patches/Rename-qAbs-Function-for-timeval.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d9ff510f02bba63dabe7a081a68296056a89ae4c 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> ---- - 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 5530e68..2e95405 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ deppath_gnu.diff -Rename-qAbs-Function-for-timeval.patch # Debian specific. build_examples.patch |