[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:56 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit c8535d57933ccf9f58cd72a27795718aef088053
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 1 22:32:51 2011 +0300

    Fix monotonic clock detection on kFreeBSD.
    
    This should unbreak QProcess::waitForFinished(). (Closes: #624679)
    (patch kfreebsd_monotonic_clock.diff)
---
 debian/changelog                             |    5 +++++
 debian/patches/kfreebsd_monotonic_clock.diff |   23 +++++++++++++++++++++++
 debian/patches/series                        |    1 +
 3 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8a29d6..0a957af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,11 @@ qt4-x11 (4:4.7.2-4) UNRELEASED; urgency=low
     - stop forcing the "default" symlink of the mkspecs to linux-g++, just let
       Qt create it according to the platform.
 
+  [ Modestas Vainius ]
+  * Add patch kfreebsd_monotonic_clock.diff which fixes monotonic clock
+    detection on kFreeBSD. This should unbreak QProcess::waitForFinished().
+    (Closes: #624679)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Apr 2011 22:42:35 +0200
 
 qt4-x11 (4:4.7.2-3) unstable; urgency=low
diff --git a/debian/patches/kfreebsd_monotonic_clock.diff b/debian/patches/kfreebsd_monotonic_clock.diff
new file mode 100644
index 0000000..94a6b54
--- /dev/null
+++ b/debian/patches/kfreebsd_monotonic_clock.diff
@@ -0,0 +1,23 @@
+From: José Manuel Santamaría Lema <panfaust at gmail.com>
+From: Pino Toscano <pino at kde.org>
+From: Modestas Vainius <modax at debian.org>
+Subject: Fix monotonic clock detection on kFreeBSD
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624679
+Last-Update: 2011-05-01
+Origin: vendor
+Forwarded: not-needed
+
+Fix monotonic clock detection on kFreeBSD at configure time. This will finally
+enable it in QElapsedTimer.
+
+QProcess::waitForFinished() and all other qt_safe_select() users cannot safely
+operate without monotonic clock because qt_safe_select() will indicate timeout
+earlier than it is supposed when underlying select() call is interrupted
+(errno=EINTR).
+
+--- a/config.tests/unix/clock-gettime/clock-gettime.pri
++++ b/config.tests/unix/clock-gettime/clock-gettime.pri
+@@ -1,2 +1,2 @@
+ # clock_gettime() is implemented in librt on these systems
+-linux-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt
++linux-*|glibc-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt
diff --git a/debian/patches/series b/debian/patches/series
index 4cf904a..769dc6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,4 @@ x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
 99_hppa_bug561203_decrease_failure_rate.diff
 powerpcspe.diff
 sh.diff
+kfreebsd_monotonic_clock.diff

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list