[SCM] qtbase packaging branch, experimental, updated. debian/5.9.1+dfsg-2-7-g412a5de

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 412a5de75093f673eb75b77f37377272aac85915
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 4 13:54:58 2017 +0300

    Add a patch to use UTIME_NOW only if it is defined.
    
    This should fix build on kFreeBSD and Hurd.
---
 debian/changelog                   |  2 ++
 debian/patches/nonlinux_utime.diff | 17 +++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9b01f78..377672f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.9.1+dfsg-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update headers of debian/patches/fix_atspi_condition.diff.
+  * Add a patch to use UTIME_NOW only if it is defined, to fix build on
+    kFreeBSD and Hurd (nonlinux_utime.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 03 Jul 2017 15:27:25 +0300
 
diff --git a/debian/patches/nonlinux_utime.diff b/debian/patches/nonlinux_utime.diff
new file mode 100644
index 0000000..7790584
--- /dev/null
+++ b/debian/patches/nonlinux_utime.diff
@@ -0,0 +1,17 @@
+Description: make the utimensat check stricter to fail on kFreeBSD and Hurd
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Bug: https://bugreports.qt.io/browse/QTBUG-61344
+Forwarded: no
+Last-Update: 2017-07-04
+
+--- a/qmake/library/ioutils.cpp
++++ b/qmake/library/ioutils.cpp
+@@ -215,7 +215,7 @@
+         *errorString = fL1S("Cannot stat() reference file %1: %2.").arg(referenceFileName, fL1S(strerror(errno)));
+         return false;
+     }
+-#    if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L
++#    if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L && defined(UTIME_NOW)
+     const struct timespec times[2] = { { 0, UTIME_NOW }, st.st_mtim };
+     const bool utimeError = utimensat(AT_FDCWD, targetFileName.toLocal8Bit().constData(), times, 0) < 0;
+ #    else
diff --git a/debian/patches/series b/debian/patches/series
index df68b8e..3a414d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
 armv4.diff
+nonlinux_utime.diff

-- 
qtbase packaging